From: Joe Orton <jorton@apache.org>
Date: Tue, 7 Jul 2020 16:00:55 +0000 (+0000)
Subject: For TEST_SSL=1 runs, test SSLSessionCache with shmcb, memcached
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8da86ab6c7de6174a6ce3cef51f83a9ebc01338;p=thirdparty%2Fapache%2Fhttpd.git

For TEST_SSL=1 runs, test SSLSessionCache with shmcb, memcached
and redis socache providers.  Force TLSv1.2 for these runs since
TLSv1.3 doesn't use the cache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879594 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index f30bf45082e..3ccc0e7282b 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -104,6 +104,13 @@ if test -v TEST_LDAP -a -x test/perl-framework/scripts/ldap-init.sh; then
     popd
 fi
 
+if test -v TEST_SSL; then
+    pushd test/perl-framework
+       ./scripts/memcached-init.sh
+       ./scripts/redis-init.sh
+    popd
+fi
+
 if test -v APR_VERSION; then
     install_apx apr ${APR_VERSION} "${APR_CONFIG}"
     APU_CONFIG="$APU_CONFIG --with-apr=$HOME/root/apr-${APR_VERSION}"
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index aaa0a722bc7..77dda889dfc 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -76,14 +76,11 @@ if ! test -v SKIP_TESTING; then
 
     if test -v TEST_SSL -a $RV -eq 0; then
         pushd test/perl-framework
-            # A test suite run with SSLSessionCache defined (see t/conf/ssl.conf.in)
-            SSL_SESSCACHE=shmcb ./t/TEST -defines TEST_SSL_SESSCACHE t/ssl
-            RV=$?
-            if test $RV -eq 0; then
-                # A test suite run with "SSLProtocol TLSv1.2" (see t/conf/ssl.conf.in)
-                ./t/TEST -sslproto TLSv1.2 t/ssl
+            for cache in shmcb redis:localhost:6379 memcache:localhost:11211; do
+                SSL_SESSCACHE=$cache ./t/TEST -sslproto TLSv1.2 -defines TEST_SSL_SESSCACHE t/ssl
                 RV=$?
-            fi
+                test $RV -eq 0 || break
+            done
         popd
     fi