From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 28 Nov 2008 11:40:59 +0000 (+1300)
Subject: Fix various TestBed errors.
X-Git-Tag: SQUID_3_2_0_1~1323
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=945980c035fb100677ac6bc019afa20547a44228;p=thirdparty%2Fsquid.git

Fix various TestBed errors.

Failure to match the error: string properly and some bad options in the
layer-02 script was hiding a few bad configure and compile issues.

TODO: Most of the hidden bugs are also fixed by this patch. At least one
      remains though in the linking of some tests.
---

diff --git a/configure.in b/configure.in
index 7aad78009f..b9ff773317 100644
--- a/configure.in
+++ b/configure.in
@@ -809,17 +809,13 @@ then
     dnl eCAP support requires loadable modules, which are enabled by default
     if test "$use_loadable_modules" != "yes"
     then
-        AC_MSG_ERROR([
-            eCAP support requires loadable modules. Please do not use
-            --disable-loadable-modules with --enable-ecap.]);
+        AC_MSG_ERROR([eCAP support requires loadable modules. Please do not use --disable-loadable-modules with --enable-ecap.]);
     fi
 
     dnl eCAP support requires libecap
     AC_CHECK_LIB([ecap], [main],
         [ECAP_LIBS="-lecap"],
-        [AC_MSG_FAILURE([
-            eCAP support requires libecap library,
-            but no usable library was found])]
+        AC_MSG_FAILURE([eCAP support requires libecap library, but no usable library was found])
     )
 fi
 
diff --git a/test-builds.sh b/test-builds.sh
index ac3b584e2e..76a6d2961c 100755
--- a/test-builds.sh
+++ b/test-builds.sh
@@ -9,13 +9,16 @@ if test "${1}" = "--cleanup" ; then
 	shift
 fi
 
+# Things to catch
+errors="^ERROR|\ error:|\ Error\ |No\ such|assertion\ failed|FAIL:"
+
 # Run a single test build by name
 tmp="${1}"
 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|assertion\ failed|FAIL:" buildtest_*.log && exit 1
+	grep -E "${errors}" buildtest_*.log && exit 1
 	cd ..
 	exit 0
 fi
@@ -33,7 +36,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}"
-	grep -E "^ERROR|\ error:\ |No\ such|assertion\ failed|FAIL:" buildtest_*.log && exit 1
+	grep -E "${errors}" buildtest_*.log && exit 1
 	cd ..
 	if test "${cleanup}" = "yes" ; then
 		echo "REMOVE: bt${layer}"
diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 233d7bc0be..04a6b27d51 100644
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -23,6 +23,13 @@
 #   --with-po2html=PATH \
 #   --with-tags=TAGS \
 #
+#	Following features require special support from other optional packages.
+#	We can't test them automatically everywhere
+#
+#   --enable-ecap \
+#   --enable-win32-service \
+#   --with-localhost-ipv6 \
+#
 OPTS=" \
 	--enable-loadable-modules \
 	--enable-gnuregex \
@@ -38,7 +45,6 @@ OPTS=" \
 	--enable-delay-pools \
 	--enable-esi \
 	--enable-icap-client \
-	--enable-ecap \
 	--enable-useragent-log \
 	--enable-referer-log \
 	--enable-wccp \
@@ -74,7 +80,6 @@ OPTS=" \
 	--enable-ntlm-fail-open \
 	--enable-external-acl-helpers=all \
 	--enable-mempools \
-	--enable-win32-service \
 	--enable-unlinkd \
 	--enable-stacktraces \
 	--enable-cpu-profiling \
@@ -88,10 +93,8 @@ OPTS=" \
 	--with-dl \
 	--with-dns-cname \
 	--with-gnu-ld \
-	--with-ipv4-mapped \
 	--with-ipv6-split-stack \
 	--with-large-files \
-	--with-localhost-ipv6 \
 	--with-pic \
 	--with-pthreads \
 	--with-valgrind-debug \