Changeset 1a6eeae in mod_gnutls

Timestamp:

Feb 1, 2020, 12:33:12 PM (3 weeks ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

bfef00c

Parents:

2794787

Message:

Allow overriding the default HTTPD mutex via configure

The custom config file in the CI test environment can't be passed to
the distcheck environment, which broke builds with the previous
commit. This should be a clean solution.

Files:

• .github/workflows/build.yml (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)

.github/workflows/build.yml

@@ -36 +36 @@
         run: autoreconf -fiv
       - name: configure
-        run: TEST_IP=127.0.0.1 ./configure
+        run: TEST_IP=127.0.0.1 APACHE_MUTEX=pthread ./configure
       - name: store config.log
         uses: actions/upload-artifact@v1
@@ -45 +45 @@
       - name: make
         run: make
-      - name: set mutex
-        run: |
-          echo "Mutex pthread default" >test/apache-conf/github_mutex.conf
       - name: make check
         run: VERBOSE=1 make check

Makefile.am

@@ -9 +9 @@
 AM_DISTCHECK_CONFIGURE_FLAGS = "--enable-vpath-install" \
         "TEST_IP=$(TEST_IP)" "TEST_HOST=$(TEST_HOST)" \
-        "SOFTHSM_LIB=$(SOFTHSM_LIB)"
+        "APACHE_MUTEX=$(APACHE_MUTEX)" "SOFTHSM_LIB=$(SOFTHSM_LIB)"
 DISTCLEANFILES = config.nice
 MOSTLYCLEANFILES = $(DX_CLEANFILES)

configure.ac

@@ -159 +159 @@
       [use_netns="yes"], [use_netns="no"])
 AM_CONDITIONAL([ENABLE_NETNS], [test "$use_netns" != "no"])
-# Adjust Apache configuration for tests accordingly: Use pthread mutex
-# and test specific PID files if using namespaces, defaults otherwise.
-AS_IF([test "$use_netns" = "yes"],
-      [MUTEX_CONF="Mutex pthread default"; PID_AFFIX="-\${TEST_NAME}"],
-      [MUTEX_CONF=""; PID_AFFIX=""])
-AC_SUBST(MUTEX_CONF)
-AC_SUBST(PID_AFFIX)
-AM_SUBST_NOTMAKE(MUTEX_CONF)
-AM_SUBST_NOTMAKE(PID_AFFIX)
 
 AC_ARG_ENABLE(msva,
@@ -228 +219 @@
 AC_SUBST(MODULE_LIBS)
 
+# Adjust Apache configuration for tests: Use pthread mutex and test
+# specific PID files if using namespaces. Otherwise defaults are used,
+# and the user can override the default mutex type.
+AC_ARG_VAR([APACHE_MUTEX], [Override the default mutex for the test \
+                           environment. The value is used only when running \
+                           without namespace isolation, tests running in \
+                           their own namespaces always use "pthread".])
+AS_IF([test -n "${APACHE_MUTEX}"],
+      [MUTEX_CONF="Mutex ${APACHE_MUTEX} default"],
+      [MUTEX_CONF=""])
+AS_IF([test "$use_netns" = "yes"],
+      [MUTEX_CONF="Mutex pthread default"; PID_AFFIX="-\${TEST_NAME}"],
+      [PID_AFFIX=""])
+AC_SUBST(MUTEX_CONF)
+AC_SUBST(PID_AFFIX)
+AM_SUBST_NOTMAKE(MUTEX_CONF)
+AM_SUBST_NOTMAKE(PID_AFFIX)
+
 # assign default values to TEST_HOST and TEST_IP if necessary
 : ${TEST_HOST:="localhost"}