From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 30 Mar 2014 21:28:10 +0000 (+1200)
Subject: Fix test suite parameters after --enable-ssl change
X-Git-Tag: SQUID_3_5_0_1~310
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f35759297ee47fb45a971fd59e6de9c75a6ce47f;p=thirdparty%2Fsquid.git

Fix test suite parameters after --enable-ssl change
---

diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index eeb92608a7..b1b0a06073 100644
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -54,7 +54,7 @@ DISTCHECK_CONFIGURE_FLAGS=" \
 	--disable-cachemgr-hostname \
 	--disable-eui \
 	--disable-htcp \
-	--disable-ssl \
+	--disable-ssl-crtd \
 	--disable-forw-via-db \
 	--disable-cache-digests \
 	--disable-poll \
@@ -97,6 +97,7 @@ DISTCHECK_CONFIGURE_FLAGS=" \
 	--without-valgrind-debug \
 	--without-ipv6-split-stack \
 	--without-dns-cname \
+	--without-openssl \
 	--without-po2html \
 	"
 
diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index bf7aa7dace..f6253244b7 100644
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -24,7 +24,6 @@ MAKETEST="distcheck"
 #   --with-aufs-threads=N \
 #   --with-filedescriptors=N \
 #   --with-cppunit-basedir=PATH \
-#   --with-openssl=PATH \
 #   --with-po2html=PATH \
 #   --with-tags=TAGS \
 #
@@ -67,7 +66,6 @@ DISTCHECK_CONFIGURE_FLAGS=" \
 	--enable-cachemgr-hostname \
 	--enable-eui \
 	--enable-htcp \
-	--enable-ssl \
 	--enable-forw-via-db \
 	--enable-cache-digests \
 	--enable-poll \
@@ -107,6 +105,7 @@ DISTCHECK_CONFIGURE_FLAGS=" \
 	--with-pthreads \
 	--enable-build-info=squid\ test\ build \
 	--enable-ssl-crtd \
+	--with-openssl \
 	"
 
 # Fix the distclean testing.