Changeset ee6351d in mod_gnutls

Timestamp:

Jan 30, 2020, 7:46:37 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

8b14b13

Parents:

57dec86

Message:

Test suite: Use mod_mpm_event by default

The "event" MPM module is more reliable, Valgrind tests showed
occasional mutex errors during shutdown in "worker". The tests still
fall back on the "worker" MPM if "event" is not available (that was
the case on Debian/HURD the last time I checked).

Location:

test

Files:

• Makefile.am (modified) (1 diff)
• base_apache.conf (modified) (1 diff)
• required-modules.py (modified) (2 diffs)

test/Makefile.am

@@ -270 +270 @@
 MOSTLYCLEANFILES += apache-conf/required-modules.conf
 apache-conf/required-modules.conf: required-modules.py
-        APACHE2=$(APACHE2) $(PYTHON) $< >$@
+        APACHE2=@APACHE2@ AP_LIBEXECDIR=@AP_LIBEXECDIR@ $(PYTHON) $< >$@
 
 # Documentation for the test system

test/base_apache.conf

@@ -14 +14 @@
 LogLevel debug
 
-LoadModule      mpm_worker_module       ${AP_LIBEXECDIR}/mod_mpm_worker.so
+# The mpm module to use (event or worker) is selected in
+# apache-conf/required-modules.conf, see required-modules.py
 StartServers    2
 MinSpareThreads 10

test/required-modules.py

@@ -4 +4 @@
 import shutil
 import subprocess
+from pathlib import Path
 
 required_modules = {'logio', 'unixd', 'log_config'}
 
-apache2 = os.environ.get('APACHE2')
-if not apache2:
-    apache2 = shutil.which('apache2')
-if not apache2:
-    apache2 = shutil.which('httpd')
+apache2 = os.environ['APACHE2']
 
 result = subprocess.run([apache2, '-l'], check=True,
@@ -25 +22 @@
 for mod in (required_modules - built_in_modules):
     print(f'LoadModule\t{mod}_module\t${{AP_LIBEXECDIR}}/mod_{mod}.so')
+
+# select mpm module, list is ordered by preference
+mpm_choices = ['event', 'worker']
+mod_dir = Path(os.environ['AP_LIBEXECDIR'])
+for mpm in mpm_choices:
+    mod = mod_dir.joinpath(f'mod_mpm_{mpm}.so')
+    if mod.exists():
+        print(f'LoadModule\tmpm_{mpm}_module\t{mod!s}')
+        break