svn commit: r1895451 - in /httpd/httpd/trunk: .travis.yml test/travis_run_linux.sh

[ic...@apache.org]

Author: icing
Date: Wed Dec  1 09:50:33 2021
New Revision: 1895451

URL: http://svn.apache.org/viewvc?rev=1895451&view=rev
Log:
 * test suite: add an image to test mod_tls on travis
   Let's see what the hamsters think of the setup I use
   on a local docker focal.


Modified:
    httpd/httpd/trunk/.travis.yml
    httpd/httpd/trunk/test/travis_run_linux.sh

Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1895451&r1=1895450&r2=1895451&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Wed Dec  1 09:50:33 2021
@@ -332,6 +332,41 @@ jobs:
             - python3-requests
             - golang-1.14
     # -------------------------------------------------------------------------
+    - if: *condition_not_24x
+      name: Linux Ubuntu, event MPM, MOD_TLS test suite
+      dist: focal
+      env: APR_VERSION=1.7.0
+           APU_VERSION=1.6.1 APU_CONFIG="--with-crypto"
+           CONFIG="--enable-mods-shared=reallyall --with-mpm=event --enable-mpms-shared=event"
+           NO_TEST_FRAMEWORK=1 TEST_INSTALL=1 TEST_MOD_TLS=1
+      addons:
+        apt:
+          sources:
+            - sourceline: 'deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe'
+          packages:
+            - cpanminus
+            - libtool-bin
+            - libapr1-dev
+            - libaprutil1-dev
+            - perl-doc
+            - liblua5.3-dev
+            - libbrotli-dev
+            - libcurl4-openssl-dev
+            - libsystemd-dev
+            - libnghttp2-dev
+            - libjansson-dev
+            - libpcre2-dev
+            - libldap2-dev
+            - ldap-utils
+            - gdb
+            - curl
+            - python3-pytest
+            - nghttp2-client
+            - python3-cryptography
+            - python3-requests
+            - cargo
+            - cbindgen
+    # -------------------------------------------------------------------------
     - name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1, LDAP
       env: APR_VERSION=1.7.0
            APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap"

Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1895451&r1=1895450&r2=1895451&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Wed Dec  1 09:50:33 2021
@@ -51,6 +51,20 @@ else
     CONFIG="$CONFIG --with-apr-util=/usr"
 fi
 
+# Since librustls is not a package (yet) on any platform, we
+# build the version we want from source
+if test -v TEST_MOD_TLS; then
+  RUSTLS_HOME="$HOME/build/rustls-ffi"
+  RUSTLS_VERSION="v0.8.2"
+  git clone https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME"
+  pushd "$RUSTLS_HOME"
+    git fetch origin
+    git checkout tags/$RUSTLS_VERSION
+    make install
+  popd
+  CONFIG="$CONFIG --with-tls"
+fi
+
 srcdir=$PWD
 
 if test -v TEST_VPATH; then
@@ -195,6 +209,14 @@ if ! test -v SKIP_TESTING; then
         RV=$?
     fi
 
+    if test -v TEST_MOD_TLS -a $RV -eq 0; then
+        # Run mod_tls tests. The underlying librustls was build
+        # and installed before we configured the server (see top of file).
+        # This will be replaved once librustls is available as a package.
+        py.test-3 test/modules/tls
+        RV=$?
+    fi
+
     # Catch cases where abort()s get logged to stderr by libraries but
     # only cause child processes to terminate e.g. during shutdown,
     # which may not otherwise trigger test failures.