From: Joe Orton <jorton@apache.org>
Date: Mon, 13 Dec 2021 12:08:26 +0000 (+0000)
Subject: Merge r1891138 from trunk: (ci part)
X-Git-Tag: candidate-2.4.52-rc1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ae711bf90d3c454fed9eec3ada447587425392f;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1891138 from trunk: (ci part)

* test/travis_run_linux.sh: For TEST_SSL, test loading encrypted
  private keys.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1895876 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index e0b26e6305c..36be5628850 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -104,11 +104,25 @@ if ! test -v SKIP_TESTING; then
     
     if test -v TEST_SSL -a $RV -eq 0; then
         pushd test/perl-framework
+            # Test loading encrypted private keys
+            ./t/TEST -defines "TEST_SSL_DES3_KEY TEST_SSL_PASSPHRASE_EXEC" t/ssl
+            RV=$?
+
+            # Log the OpenSSL version.
+            grep 'mod_ssl.*compiled against' t/logs/error_log | tail -n 1
+            
+            # Test various session cache backends
             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=$?
                 test $RV -eq 0 || break
-            done
+
+                SSL_SESSCACHE=$cache ./t/TEST -sslproto TLSv1.2 -defines TEST_SSL_SESSCACHE -start
+                ./t/TEST t/ssl
+                RV=$?
+                ./t/TEST -stop
+                SRV=$?
+                if test $RV -eq 0 -a $SRV -ne 0; then
+                    RV=$SRV
+                fi
         popd
     fi