Changes in test/proxy_backend.bash [f87c1b5:50eab8e] in mod_gnutls


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/proxy_backend.bash

    rf87c1b5 r50eab8e  
    22
    33set -e
    4 . ${srcdir}/common.bash
    54
    65if [ -z "${BACKEND_HOST}" ]; then
     
    1312    export BACKEND_PORT="9934"
    1413fi
    15 : ${BACKEND_PID:="backend.pid"}
     14: ${BACKEND_LOCK:="backend.lock"}
    1615: ${srcdir:="."}
    1716: ${APACHE2:="apache2"}
     
    2524    lockfile="${4}"
    2625
     26    if [ -n "${lockfile}" ]; then
     27        flock_cmd="flock -w ${TEST_LOCK_WAIT} ${lockfile}"
     28    fi
     29
    2730    TEST_NAME="$(basename "${dir}")"
    2831    (
     
    3336        case $action in
    3437            start)
    35                 if [ -n "${USE_TEST_NAMESPACE}" ]; then
    36                     echo "Using namespaces to isolate tests, no need for" \
    37                          "locking."
    38                     flock_cmd=""
    39                 elif [ -n "${lockfile}" ]; then
    40                     flock_cmd="${FLOCK} -w ${TEST_LOCK_WAIT} ${lockfile}"
    41                 else
    42                     echo "Locking disabled, using wait based on proxy PID file."
    43                     wait_pid_gone "${BACKEND_PID}"
    44                     flock_cmd=""
    45                 fi
    4638                ${flock_cmd} \
    4739                    ${APACHE2} -f "$(realpath ${testdir}/${conf})" -k start || return 1
Note: See TracChangeset for help on using the changeset viewer.