Changeset c4ba2b60 in mod_gnutls

Timestamp:

Jan 27, 2020, 2:25:53 AM (8 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

c5f8e85

Parents:

c05b8c5

git-author:

Fiona Klute <fiona.klute@…> (01/27/20 02:24:39)

git-committer:

Fiona Klute <fiona.klute@…> (01/27/20 02:25:53)

Message:

Test suite: Automatically detect required modules

Which modules are compiled into the Apache binary varies between
distributions. required-modules.py creates additional LoadModule?
directives if needed.

Files:

• .github/workflows/build.yml (modified) (1 diff)
• test/.gitignore (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/required-modules.py (added)

.github/workflows/build.yml

@@ -78 +78 @@
         run: |
           echo "Mutex sem default" >test/apache-conf/github_mutex.conf
-      - name: configure extra modules needed for Fedora
-        run: |
-          cat - >test/apache-conf/fedora.conf <<EOF
-          LoadModule  log_config_module  \${AP_LIBEXECDIR}/mod_log_config.so
-          LoadModule  logio_module       \${AP_LIBEXECDIR}/mod_logio.so
-          LoadModule  unixd_module       \${AP_LIBEXECDIR}/mod_unixd.so
-          EOF
       - name: make check
         run: VERBOSE=1 make check

test/.gitignore

@@ -3 +3 @@
 proxy_backend.conf
 ocsp_server.conf
+apache-conf/required-modules.conf
 authority/template
 authority/client/uid

test/Makefile.am

@@ -67 +67 @@
 noinst_PYTHON = https-test-client.py mgstest/http.py mgstest/__init__.py \
         mgstest/hooks.py mgstest/services.py mgstest/softhsm.py \
-        mgstest/tests.py runtest.py softhsm-init.py doctest-mgstest.py
+        mgstest/tests.py runtest.py softhsm-init.py doctest-mgstest.py \
+        required-modules.py
 
 # Identities in the miniature CA, server, and client environment for
@@ -251 +252 @@
         data/test.txt data/secret/mirror.cgi data/secret/test.txt \
         mime.types proxy_mods.conf
+
+# Which modules are compiled into the Apache binary varies between
+# distributions. required-modules.py creates additional LoadModule
+# directives if needed.
+check_DATA += apache-conf/required-modules.conf
+MOSTLYCLEANFILES += apache-conf/required-modules.conf
+apache-conf/required-modules.conf: required-modules.py
+        APACHE2=$(APACHE2) $(PYTHON) $< >$@
 
 # Documentation for the test system