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+=" dekker-fences/dekker-fences"
+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 {
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
- echo
- echo "Test done; sleeping for a few seconds"
- echo
- sleep 3
-
- echo "*******************************"
- echo "Re-running test for timing data"
- echo "*******************************"
- (time ${RUN} ${t} ${ARGS} > /dev/null 2>&1) 2>&1
+ (time ${RUN} ${t} ${ARGS} 2>&1) 2>&1 | tee ${LOG}
echo
echo "Test done; sleeping for a few seconds"
echo
}
mkdir ${DIR}
-(git log --oneline -1; echo; run_all_tests) | tee ${DIR}/timing.log
+(cd ..; git log --oneline -1; cd - > /dev/null; git log --oneline -1; echo; run_all_tests) | tee ${DIR}/timing.log