X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=modelchecker%2Ftest.sh;h=84d30e71152bbd4fbec11ba4ed55bed8b0444e48;hb=ac8d9afc8de1218083638d0871e98ff15daa9aab;hp=205c472f00245e8c6889c3d3ccb66efb4a8df444;hpb=b9f0343d3d3f07f8c1553bc44995a3c93c2de296;p=mc1516pa.git

diff --git a/modelchecker/test.sh b/modelchecker/test.sh
index 205c472..84d30e7 100755
--- 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"