TestBed: update to properly abort on test failures

diff --git a/src/main.cc b/src/main.cc
index 816d430483a2a4fd96c4cc188e900290ad4b613d..cc9343cb52cb48ff4aa9c0e7f0492477deea4748 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,3 +1,4 @@
+#error
 /*
  * $Id: main.cc,v 1.459 2008/02/26 21:49:35 amosjeffries Exp $
  *

diff --git a/test-builds.sh b/test-builds.sh
index 3ec2c8f86a390e8dda9e169eafe43842b159ea03..7a68bc35d9a699003da9e78d2d6c54b4fb757c77 100755 (executable)
--- a/test-builds.sh
+++ b/test-builds.sh
@@ -15,7 +15,11 @@ if test -e ./test-suite/buildtests/${tmp}.opts ; then
        echo "TESTING: ${tmp}"
        rm -f -r bt${tmp} && mkdir bt${tmp} && cd bt${tmp}
        ../test-suite/buildtest.sh ../test-suite/buildtests/${tmp}
-       ( grep -E "^ERROR|\ error:\ |No\ such" buildtest_*.log && exit 1 )
+       err=`grep -E "^ERROR|\ error:\ |No\ such|assertion\ failed|FAIL:" buildtest_*.log`
+       if test "${err}" != "" ; then
+               echo ${err}
+               exit 1
+       fi
        cd ..
        exit 0
 fi
@@ -32,8 +36,12 @@ for f in `ls -1 ./test-suite/buildtests/layer*.opts` ; do
        rm -f -r bt${layer} && mkdir bt${layer} && cd bt${layer}
        arg=`echo "${f}" | sed s/\\.opts//`
        echo "TESTING: ${arg}"
-       ../test-suite/buildtest.sh ".${arg}" ||
-       ( grep -E "^ERROR|\ error:\ |No\ such" buildtest_*.log && exit 1 )
+       ../test-suite/buildtest.sh ".${arg}"
+       err=`grep -E "^ERROR|\ error:\ |No\ such|assertion\ failed|FAIL:" buildtest_*.log`
+       if test "${err}" != "" ; then
+               echo ${err}
+               exit 1
+       fi
        cd ..
        if test "${cleanup}" = "yes" ; then
                echo "REMOVE: bt${layer}"