From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 6 Nov 2008 08:39:29 +0000 (+1300)
Subject: Rollback grep change. produced mangled reports
X-Git-Tag: SQUID_3_2_0_1~1349
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea32e672c99c8b497356fed5fbeaab3bbe9fe313;p=thirdparty%2Fsquid.git

Rollback grep change. produced mangled reports
---

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}"