Rollback grep change. produced mangled reports

diff --git a/test-builds.sh b/test-builds.sh
index 7a68bc35d9a699003da9e78d2d6c54b4fb757c77..ac3b584e2e4615b821c45553406176e6aa847f13 100755 (executable)
--- a/test-builds.sh
+++ b/test-builds.sh
@@ -15,11 +15,7 @@ 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}
-       err=`grep -E "^ERROR|\ error:\ |No\ such|assertion\ failed|FAIL:" buildtest_*.log`
-       if test "${err}" != "" ; then
-               echo ${err}
-               exit 1
-       fi
+       grep -E "^ERROR|\ error:\ |No\ such|assertion\ failed|FAIL:" buildtest_*.log && exit 1
        cd ..
        exit 0
 fi
@@ -37,11 +33,7 @@ for f in `ls -1 ./test-suite/buildtests/layer*.opts` ; do
        arg=`echo "${f}" | sed s/\\.opts//`
        echo "TESTING: ${arg}"
        ../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
+       grep -E "^ERROR|\ error:\ |No\ such|assertion\ failed|FAIL:" buildtest_*.log && exit 1
        cd ..
        if test "${cleanup}" = "yes" ; then
                echo "REMOVE: bt${layer}"