Cleaned up main, removed some options

[mc1516pa.git] / modelchecker / test.sh

diff --git a/modelchecker/test.sh b/modelchecker/test.sh
index 205c472..84d30e7 100755 (executable)
--- a/modelchecker/test.sh
+++ b/modelchecker/test.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
+set -e
 
-for testscreen in tests/*; do
+make
+cd tests
+./generate_tests.sh
+cd ..
+TOTAL=0
+PASSED=0
+for testscreen in tests/[^g]*; do
        NUM="$(basename "$(echo $testscreen | cut -d'.' -f1)")"
        OUT="$(./main "$testscreen" 2>&1| grep -Po "(?<=Satcount: )\d+(?=\.)")"
-       echo "Output: $OUT"
+       ./main "$testscreen" 2>&1
        if [ "$NUM" -ne "$OUT" ]; then
-               echo "$testscreen failed"
-               echo "Expected: $NUM"
-               echo "Got: $OUT"
-               cat "$testscreen"
+               echo "$testscreen failed, expected: $NUM, got: $OUT."
+               echo "'$(cat "$testscreen")'"
        else
-               echo "$testscreen passed"
+               PASSED=$((PASSED+1))
        fi
+       TOTAL=$((TOTAL+1))
 done
+echo "$((TOTAL-PASSED))/$TOTAL failed"