commit 2361315143a9de540db338bcc812877c37da0fe7
author Joe Orton <jorton@apache.org> Fri Mar 01 10:15:13 2024 +0000
committer Joe Orton <jorton@apache.org> Fri Mar 01 10:15:13 2024 +0000
tree 88f62a876c95e464330973c5aee693cba3cddc8b
parent fed3652d82edfa0d324e95c1831631cbb73bba21

CI: add OpenSSL 3.2, test OpenSSL 3.x using Apache::Test
trunk to pick up r1916067.


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

.github/workflows/linux.yml

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index a8500d2..0e716bc 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -267,7 +267,7 @@
           #     APU_VERSION=1.6.3
           # APU_CONFIG="--with-crypto --with-ldap"
           # -------------------------------------------------------------------------
-          - name: OpenSSL 3.1 build
+          - name: OpenSSL 3.1
             config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
             env: |
               TEST_OPENSSL3=3.1.5
@@ -275,19 +275,19 @@
               APU_VERSION=1.6.3
               APU_CONFIG="--without-crypto"
           # -------------------------------------------------------------------------
-          - name: OpenSSL 3.1 -Werror build
+          - name: OpenSSL 3.2 -Werror
             config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
             notest-cflags: -Werror -O2 -Wno-deprecated-declarations
             env: |
-              TEST_OPENSSL3=3.1.5
+              TEST_OPENSSL3=3.2.1
               APR_VERSION=1.7.4
               APU_VERSION=1.6.3
               APU_CONFIG="--without-crypto"
           # -------------------------------------------------------------------------
-          - name: OpenSSL 3.1 no-engine build
+          - name: OpenSSL 3.2 no-engine
             config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
             env: |
-              TEST_OPENSSL3=3.1.5
+              TEST_OPENSSL3=3.2.1
               OPENSSL_CONFIG=no-engine
               APR_VERSION=1.7.4
               APU_VERSION=1.6.3

test/travis_before_linux.sh

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index e679318..32fbbb8 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -85,6 +85,13 @@
 
     # Make a shallow clone of httpd-tests git repo.
     git clone -q --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework
+
+    # For OpenSSL 3.2+ testing, Apache::Test r1916067 is required, so
+    # use a checkout of trunk until there is an updated CPAN release
+    # with that revision.
+    if test -v TEST_OPENSSL3; then
+       svn co -q https://svn.apache.org/repos/asf/perl/Apache-Test/trunk test/perl-framework/Apache-Test
+    fi
 fi
 
 # For LDAP testing, run slapd listening on port 8389 and populate the