Changeset 412ee84 in mod_gnutls for test/runtests

Timestamp:

Nov 25, 2015, 7:05:35 PM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, 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:

• test/runtests (modified) (3 diffs)

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})"