Changeset 412ee84 in mod_gnutls

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.

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (3 diffs)
• test/common.bash (added)
• test/proxy_backend.bash (modified) (4 diffs)
• test/runtests (modified) (3 diffs)

configure.ac

@@ -59 +59 @@
 AC_MSG_CHECKING([whether to enable SRP functionality])
 AC_MSG_RESULT($use_srp)
+
+dnl Optionally disable flock
+AC_ARG_ENABLE(flock,
+        AS_HELP_STRING([--disable-flock], [Disable use of flock during tests]),
+        [use_flock=$enableval], [use_flock=yes])
+dnl If flock is not disabled, make sure it's available
+if test "$enable_flock" != "no"; then
+        AC_PATH_PROG([FLOCK], [flock], [no])
+        use_flock=${FLOCK}
+fi
+AM_CONDITIONAL([DISABLE_FLOCK], [test "$enable_flock" = "no"])
 
 AC_ARG_ENABLE(msva,

test/Makefile.am

@@ -127 +127 @@
 # Lockfile for the main Apache process
 test_lockfile = ./test.lock
-# Maximum wait time in seconds for flock to aquire instance lock files
+# Lockfile for the proxy backend Apache process (if any)
+backend_lockfile = ./backend.lock
+# Maximum wait time in seconds for flock to aquire instance lock
+# files, or Apache to remove its PID file
 lock_wait = 30
 
@@ -143 +146 @@
 AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
         export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
-        export TEST_LOCK="$(test_lockfile)"; \
         export TEST_LOCK_WAIT="$(lock_wait)"; \
         export TEST_HOST="$(TEST_HOST)"; \
@@ -153 +155 @@
         export BACKEND_HOST="$(TEST_HOST)";
 
+# Without flock tests must not run in parallel. Otherwise set lock files.
+if DISABLE_FLOCK
+.NOTPARALLEL:
+else
+AM_TESTS_ENVIRONMENT += export FLOCK="$(FLOCK)"; \
+        export TEST_LOCK="$(test_lockfile)"; \
+        export BACKEND_LOCK="$(backend_lockfile)";
+endif
+
 # Echo AM_TESTS_ENVIRONMENT. This can be useful for debugging, e.g. if
 # you want to manually run an Apache instance with Valgrind using the

test/proxy_backend.bash

@@ -2 +2 @@
 
 set -e
+. ${srcdir}/common.bash
 
 if [ -z "${BACKEND_HOST}" ]; then
@@ -12 +13 @@
     export BACKEND_PORT="9934"
 fi
-: ${BACKEND_LOCK:="backend.lock"}
+: ${BACKEND_PID:="backend.pid"}
 : ${srcdir:="."}
 : ${APACHE2:="apache2"}
@@ -24 +25 @@
     lockfile="${4}"
 
-    if [ -n "${lockfile}" ]; then
-        flock_cmd="flock -w ${TEST_LOCK_WAIT} ${lockfile}"
-    fi
-
     TEST_NAME="$(basename "${dir}")"
     (
@@ -36 +33 @@
         case $action in
             start)
+                if [ -n "${lockfile}" ]; then
+                    flock_cmd="${FLOCK} -w ${TEST_LOCK_WAIT} ${lockfile}"
+                else
+                    echo "Locking disabled, using wait based on proxy PID file."
+                    wait_pid_gone "${BACKEND_PID}"
+                    flock_cmd=""
+                fi
                 ${flock_cmd} \
                     ${APACHE2} -f "$(realpath ${testdir}/${conf})" -k start || return 1

test/runtests

@@ -6 +6 @@
 
 set -e
+. ${srcdir}/common.bash
 
 testid="${1##t-}"
@@ -18 +19 @@
 BADVARS=0
 for v in APACHE2 TEST_HOST TEST_PORT TEST_QUERY_DELAY TEST_MSVA_WAIT \
-                 MSVA_PORT TEST_LOCK; do
+                 MSVA_PORT; do
     if [ ! -v "$v" ]; then
         printf "You need to set the %s environment variable\n" "$v" >&2
@@ -150 +151 @@
 fi
 
+TEST_PID="apache2.pid"
 # configure locking for the Apache process
-flock_cmd="flock -w ${TEST_LOCK_WAIT} $(realpath ${TEST_LOCK})"
+if [ -n "${TEST_LOCK}" ]; then
+    flock_cmd="${FLOCK} -w ${TEST_LOCK_WAIT} $(realpath ${TEST_LOCK})"
+else
+    echo "Locking disabled, using wait based on Apache PID file."
+    wait_pid_gone "${TEST_PID}"
+    flock_cmd=""
+fi
 
 t="$(realpath ${testid})"