Changeset 4ae5b82 in mod_gnutls for test

Timestamp:

Feb 8, 2017, 7:27:17 AM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, proxy-ticket, upstream

Children:

fb4da99

Parents:

6c030c1

Message:

Check if flock supports --verbose

Some old versions of flock do not support the --verbose option, namely
the one in Debian Jessie. Check for support at configure time and
enable the option only if available.

Location:

test

Files:

• proxy_backend.bash (modified) (1 diff)
• runtests (modified) (1 diff)

test/proxy_backend.bash

@@ -38 +38 @@
                     flock_cmd=""
                 elif [ -n "${lockfile}" ]; then
-                    flock_cmd="${FLOCK} --verbose -w ${TEST_LOCK_WAIT} ${lockfile}"
+                    flock_cmd="${FLOCK} -w ${TEST_LOCK_WAIT} ${lockfile}"
                 else
                     echo "Locking disabled, using wait based on proxy PID file."

test/runtests

@@ -160 +160 @@
     flock_cmd=""
 elif [ -n "${TEST_LOCK}" ]; then
-    flock_cmd="${FLOCK} --verbose -w ${TEST_LOCK_WAIT} $(realpath ${TEST_LOCK})"
+    flock_cmd="${FLOCK} -w ${TEST_LOCK_WAIT} $(realpath ${TEST_LOCK})"
 else
     echo "Locking disabled, using wait based on Apache PID file."