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 eeb92608a7459676637e02d2ccfdf1a654f8aad8..b1b0a06073d0d7dab2fded90e1af686f48c1ed1c 100644 (file)
--- 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 bf7aa7dace339e37ea0f89e7c6a2023b120adba9..f6253244b7dd8055bd5b36abd7982282042056d7 100644 (file)
--- 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.