Changeset 412ee84 in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
Nov 25, 2015, 7:05:35 PM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
dff57b4
Parents:
a08b25e
Message:

Test suite: Allow the user to disable use of "flock"

Using "flock" causes trouble on some exotic architectures (e.g. Hurd),
so allow disabling it. Running without lock files requires serial
execution of test cases to achieve reliable results.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    ra08b25e r412ee84  
    127127# Lockfile for the main Apache process
    128128test_lockfile = ./test.lock
    129 # Maximum wait time in seconds for flock to aquire instance lock files
     129# Lockfile for the proxy backend Apache process (if any)
     130backend_lockfile = ./backend.lock
     131# Maximum wait time in seconds for flock to aquire instance lock
     132# files, or Apache to remove its PID file
    130133lock_wait = 30
    131134
     
    143146AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
    144147        export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
    145         export TEST_LOCK="$(test_lockfile)"; \
    146148        export TEST_LOCK_WAIT="$(lock_wait)"; \
    147149        export TEST_HOST="$(TEST_HOST)"; \
     
    153155        export BACKEND_HOST="$(TEST_HOST)";
    154156
     157# Without flock tests must not run in parallel. Otherwise set lock files.
     158if DISABLE_FLOCK
     159.NOTPARALLEL:
     160else
     161AM_TESTS_ENVIRONMENT += export FLOCK="$(FLOCK)"; \
     162        export TEST_LOCK="$(test_lockfile)"; \
     163        export BACKEND_LOCK="$(backend_lockfile)";
     164endif
     165
    155166# Echo AM_TESTS_ENVIRONMENT. This can be useful for debugging, e.g. if
    156167# you want to manually run an Apache instance with Valgrind using the
Note: See TracChangeset for help on using the changeset viewer.