From ea32e672c99c8b497356fed5fbeaab3bbe9fe313 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 6 Nov 2008 21:39:29 +1300 Subject: [PATCH] Rollback grep change. produced mangled reports --- test-builds.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/test-builds.sh b/test-builds.sh index 7a68bc35d9..ac3b584e2e 100755 --- 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}" -- 2.47.3