testing: propagate internal and test case failures to exit status

2 files changed, 24 insertions, 6 deletions

diff --git a/test/runtests b/test/runtests
index 62447636..7c075b25 100755
--- a/test/runtests
+++ b/test/runtests
@@ -1,4 +1,3 @@
 #!/bin/bash
 
 time bash $(dirname $0)/timed "$@"
-
diff --git a/test/timed b/test/timed
index 3ff76ee7..c48dbdb9 100755
--- a/test/timed
+++ b/test/timed
@@ -31,15 +31,34 @@ for D in $DIRS; do
 	cd $OLDPWD
 done
 
-echo ---- cases
-find $WORKING -name '*.sh' -not -size 0 | wc -l
+CASES=`find $WORKING -name '*.sh' -not -size 0 | wc -l`
+FAILURES=`find $WORKING -name '*.diff' -not -size 0 | wc -l`
 
+echo ---- cases
+echo $CASES
 echo ---- failures
-find $WORKING -name '*.diff' -not -size 0 | wc -l
+echo $FAILURES
+
+INTERNAL_ERRORS=""
 
 if [ -s $GENTEST_LOG ]; then
-	echo ---- errors
+	echo ---- internal errors
 	cat $GENTEST_LOG
 fi
 
-rm $GENTEST_LOG
+if test -s $GENTEST_LOG; then
+	INTERNAL_ERRORS="yes"
+fi
+
+rm -f $GENTEST_LOG
+
+#
+# Exit with 1 if runtests experienced some internal error. Exit with 2 if a
+# test failed. Otherwise 0.
+#
+
+if [ "$INTERNAL_ERRORS" = yes ]; then
+	exit 1;
+elif [ "$FAILURES" != "0" ]; then
+	exit 2
+fi