Changeset 63468af in mod_gnutls for test/proxy_backend.bash


Ignore:
Timestamp:
Apr 16, 2016, 11:14:26 AM (4 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
b586b27, ce12806
Parents:
02c8e54 (diff), c6cfe6e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Imported Upstream version 0.7.4

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/proxy_backend.bash

    r02c8e54 r63468af  
    22
    33set -e
     4. ${srcdir}/common.bash
    45
    56if [ -z "${BACKEND_HOST}" ]; then
     
    1213    export BACKEND_PORT="9934"
    1314fi
    14 : ${BACKEND_LOCK:="backend.lock"}
     15: ${BACKEND_PID:="backend.pid"}
    1516: ${srcdir:="."}
    1617: ${APACHE2:="apache2"}
     
    2425    lockfile="${4}"
    2526
    26     if [ -n "${lockfile}" ]; then
    27         flock_cmd="flock -w ${TEST_LOCK_WAIT} ${lockfile}"
    28     fi
    29 
    3027    TEST_NAME="$(basename "${dir}")"
    3128    (
     
    3633        case $action in
    3734            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
    3846                ${flock_cmd} \
    3947                    ${APACHE2} -f "$(realpath ${testdir}/${conf})" -k start || return 1
Note: See TracChangeset for help on using the changeset viewer.