From: Joe Orton <jorton@apache.org>
Date: Thu, 2 Jul 2020 13:31:30 +0000 (+0000)
Subject: Add additional test suite runs for the prefork & event pool-debug builds:
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4e138cca31b58f6d47273285ed0f774ee15acf7;p=thirdparty%2Fapache%2Fhttpd.git

Add additional test suite runs for the prefork & event pool-debug builds:
- run with SSLSessionCache defined (after r1879430)
- run with "SSLProtocol TLSv1.2"


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

diff --git a/.travis.yml b/.travis.yml
index 14d00d74d83..99acd1b3c25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -228,17 +228,17 @@ jobs:
            CONFIG="--enable-mods-shared=reallyall"
            TEST_MALLOC=1
     # -------------------------------------------------------------------------
-    - name: Linux Ubuntu, Shared MPMs (event), pool-debug
+    - name: Linux Ubuntu, Shared MPMs (event), pool-debug, SSL/TLS variants
       env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
            APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap"
            CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all --with-mpm=event"
-           TEST_MALLOC=1
+           TEST_MALLOC=1 TEST_SSL=1
     # -------------------------------------------------------------------------
-    - name: Linux Ubuntu, Shared MPMs (prefork), pool-debug
+    - name: Linux Ubuntu, Shared MPMs (prefork), pool-debug, SSL/TLS variants
       env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
            APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap"
            CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all --with-mpm=prefork"
-           TEST_MALLOC=1
+           TEST_MALLOC=1 TEST_SSL=1
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1, pool-debug, LDAP
       env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 109494b1678..6e681d908bc 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -73,7 +73,21 @@ if ! test -v SKIP_TESTING; then
             RV=$?
         popd
     fi
-    if test -v LITMUS; 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)
+            ./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
+                RV=$?
+            fi
+        popd
+    fi
+
+    if test -v LITMUS -a $RV -eq 0; then
         pushd test/perl-framework
            mkdir -p t/htdocs/modules/dav
            ./t/TEST -start