Changeset dbec528 in mod_gnutls for test

Timestamp:

Jul 23, 2015, 11:53:03 AM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, proxy-ticket, upstream

Children:

99f8375

Parents:

5d85ad3

Message:

Test suite: Require TEST_LOCK in runtests

TEST_LOCK is always set when runtests is called from make.

File:

• test/runtests (modified) (2 diffs)

test/runtests

@@ -16 +16 @@
 fi
 
-if [ -n "${TEST_LOCK}" ]; then
-    TEST_LOCK="$(realpath ${TEST_LOCK})"
-    flock_cmd="flock -w ${TEST_LOCK_WAIT} ${TEST_LOCK}"
-fi
-
 BADVARS=0
-for v in APACHE2 TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_GAP MSVA_PORT; do
+for v in APACHE2 TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_GAP \
+                 MSVA_PORT TEST_LOCK; do
     if [ ! -v "$v" ]; then
         printf "You need to set the %s environment variable\n" "$v" >&2
@@ -151 +147 @@
 fi
 
-if [ -z "${flock_cmd}" ]; then
-    echo "Warning: no lock file set"
-    sleep "$TEST_GAP"
-fi
+# configure locking for the Apache process
+flock_cmd="flock -w ${TEST_LOCK_WAIT} $(realpath ${TEST_LOCK})"
+
 t="$(realpath ${testid})"
 export srcdir="$(realpath ${srcdir})"