Changeset ee6351d in mod_gnutls


Ignore:
Timestamp:
Jan 30, 2020, 7:46:37 AM (3 weeks ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
master
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:
3 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r57dec86 ree6351d  
    270270MOSTLYCLEANFILES += apache-conf/required-modules.conf
    271271apache-conf/required-modules.conf: required-modules.py
    272         APACHE2=$(APACHE2) $(PYTHON) $< >$@
     272        APACHE2=@APACHE2@ AP_LIBEXECDIR=@AP_LIBEXECDIR@ $(PYTHON) $< >$@
    273273
    274274# Documentation for the test system
  • test/base_apache.conf

    r57dec86 ree6351d  
    1414LogLevel debug
    1515
    16 LoadModule      mpm_worker_module       ${AP_LIBEXECDIR}/mod_mpm_worker.so
     16# The mpm module to use (event or worker) is selected in
     17# apache-conf/required-modules.conf, see required-modules.py
    1718StartServers    2
    1819MinSpareThreads 10
  • test/required-modules.py

    r57dec86 ree6351d  
    44import shutil
    55import subprocess
     6from pathlib import Path
    67
    78required_modules = {'logio', 'unixd', 'log_config'}
    89
    9 apache2 = os.environ.get('APACHE2')
    10 if not apache2:
    11     apache2 = shutil.which('apache2')
    12 if not apache2:
    13     apache2 = shutil.which('httpd')
     10apache2 = os.environ['APACHE2']
    1411
    1512result = subprocess.run([apache2, '-l'], check=True,
     
    2522for mod in (required_modules - built_in_modules):
    2623    print(f'LoadModule\t{mod}_module\t${{AP_LIBEXECDIR}}/mod_{mod}.so')
     24
     25# select mpm module, list is ordered by preference
     26mpm_choices = ['event', 'worker']
     27mod_dir = Path(os.environ['AP_LIBEXECDIR'])
     28for mpm in mpm_choices:
     29    mod = mod_dir.joinpath(f'mod_mpm_{mpm}.so')
     30    if mod.exists():
     31        print(f'LoadModule\tmpm_{mpm}_module\t{mod!s}')
     32        break
Note: See TracChangeset for help on using the changeset viewer.