actually fail tests on error

2 files changed, 11 insertions, 14 deletions

diff --git a/src/templating/dotest.sh b/src/templating/dotest.sh
index 99ff8b201..7945ca5c5 100755
--- a/src/templating/dotest.sh
+++ b/src/templating/dotest.sh
@@ -1,20 +1,26 @@
 #!/bin/sh
 
+# Exit, with error message (hard failure)
+exit_fail() {
+    echo " FAIL: " "$@" >&2
+    exit 1
+}
+
 mustach=${mustach:-../mustach}
 echo starting test
 if test "$NOVALGRIND" = 1
 then
-	$mustach "$@" > resu.last
+	$mustach "$@" > resu.last || exit_fail "ERROR! mustach command failed ($?)!"
 else
-	valgrind $mustach "$@" > resu.last 2> vg.last
+	valgrind $mustach "$@" > resu.last 2> vg.last || exit_fail "ERROR! mustach command failed ($?)!"
 	sed -i 's:^==[0-9]*== ::' vg.last
-	awk '/^ *total heap usage: .* allocs, .* frees,.*/{if($$4-$$6)exit(1)}' vg.last || echo "ERROR! Alloc/Free issue"
+	awk '/^ *total heap usage: .* allocs, .* frees,.*/{if($$4-$$6)exit(1)}' vg.last || exit_fail "ERROR! Alloc/Free issue"
 fi
 if diff -w resu.ref resu.last
 then
 	echo "result ok"
 else
-	echo "ERROR! Result differs"
+	exit_fail "ERROR! Result differs"
 fi
 echo
-
+exit 0
diff --git a/src/templating/run-original-tests.sh b/src/templating/run-original-tests.sh
index 05b57ffd6..21481a286 100755
--- a/src/templating/run-original-tests.sh
+++ b/src/templating/run-original-tests.sh
@@ -4,15 +4,6 @@ set -eux
 
 export CFLAGS="-g"
 
-function build()
-{
-    make clean
-    make
-}
-
-# Install rebuild-on-exit handler (except for kill -9)
-trap build EXIT
-
 echo "Ensuring clean state on entry to upstream tests ..."
 make clean