Changeset 94430e6 in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
Oct 10, 2017, 12:32:13 PM (2 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, master, upstream
Children:
e00d91a
Parents:
a09df8c
Message:

Test suite: Run a separate Apache instance for the OCSP responder

This change will be needed to cache OCSP responses on start (and
schedule) instead of when needed. An OCSP responder in the same Apache
instance won't be ready while the mod_gnutls post_config hook is
executing.

The changes to lock file handling included in this patch mean that
most parts of the test framework won't need to check which locking
method (if any) is used, they can just pass a lock file which is then
used for flock or PID file checks depending on ./configure results.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    ra09df8c r94430e6  
    194194apache_data = base_apache.conf cgi_module.conf data/dump.cgi data/ocsp.cgi \
    195195        data/secret.txt data/test.txt ffdhe3072.pem mime.types \
    196         ocsp_server.conf proxy_mods.conf
     196        proxy_mods.conf
    197197
    198198EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=.uid.in) \
     
    204204# Lockfile for the proxy backend Apache process (if any)
    205205backend_lockfile = ./backend.lock
     206# Lockfile for the OCSP server Apache process (if any)
     207ocsp_lockfile = ./ocsp.lock
    206208
    207209# port for the main Apache server
     
    245247        export USE_TEST_NAMESPACE=1;
    246248endif
    247 # Without flock tests must not run in parallel. Otherwise set lock files.
     249# Without flock tests must not run in parallel, and PID files are used
     250# to prevent conflicts between server instances. Otherwise set lock
     251# files for flock.
    248252if DISABLE_FLOCK
     253AM_TESTS_ENVIRONMENT += export TEST_LOCK="apache2.pid"; \
     254        export BACKEND_LOCK="backend.pid"; \
     255        export OCSP_LOCK="ocsp.pid";
    249256.NOTPARALLEL:
    250257else
    251258AM_TESTS_ENVIRONMENT += export FLOCK="@FLOCK@"; \
    252259        export TEST_LOCK="$(test_lockfile)"; \
    253         export BACKEND_LOCK="$(backend_lockfile)";
     260        export BACKEND_LOCK="$(backend_lockfile)"; \
     261        export OCSP_LOCK="$(ocsp_lockfile)";
    254262endif
    255263
Note: See TracChangeset for help on using the changeset viewer.