bench.sh: don't 'grep' output

[model-checker-benchmarks.git] / bench.sh

diff --git a/bench.sh b/bench.sh
index 8886bccaf385f502c22a2d3ee904744d730a1000..e7efc6dceb72cdd9e016c059010e9259ae017696 100755 (executable)
--- a/bench.sh
+++ b/bench.sh
@@ -16,8 +16,16 @@ BASEDIR=.
 
 DIR="${BASEDIR}/run-${DATE}"
 
-TESTS="barrier/barrier mcs-lock/mcs-lock spsc-queue/spsc-queue mpmc-queue/mpmc-1r2w mpmc-queue/mpmc-2r1w mpmc-queue/mpmc-queue linuxrwlocks/linuxrwlocks"
-MODEL_ARGS="-f 4 -m 2"
+TESTS="barrier/barrier"
+TESTS+=" mcs-lock/mcs-lock"
+TESTS+=" spsc-queue/spsc-queue"
+TESTS+=" spsc-bugfix/spsc-queue"
+TESTS+=" mpmc-queue/mpmc-2r1w"
+TESTS+=" mpmc-queue/mpmc-1r2w-noinit"
+TESTS+=" mpmc-queue/mpmc-queue-noinit"
+TESTS+=" linuxrwlocks/linuxrwlocks"
+
+MODEL_ARGS="-f 10 -m 2 -e 1"
 COUNT=0
 
 function run_test {
@@ -32,9 +40,7 @@ function run_test {
        echo "Running test ${COUNT} (${t}): logging to ${LOG}"
        echo "ARGS=${ARGS}"
        echo "*******************************"
-       time ${RUN} ${t} ${ARGS} > ${LOG} 2>&1
-       echo
-       grep -A 2 "Number of executions" ${LOG} | tail -3
+       time ${RUN} ${t} ${ARGS} 2>&1 | tee ${LOG}
        echo
        echo "Test done; sleeping for a few seconds"
        echo