Changeset 33af2b7 in mod_gnutls for test/proxy_backend.bash


Ignore:
Timestamp:
May 11, 2015, 6:28:20 PM (5 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
31caead
Parents:
e24eed6
git-author:
Thomas Klute <thomas2.klute@…> (05/11/15 18:12:28)
git-committer:
Thomas Klute <thomas2.klute@…> (05/11/15 18:28:20)
Message:

Test suite: Add tests to "dist" target and support VPATH builds

Supporting VPATH builds requires using $srcdir to find non-generated
data rather than fixed relative paths. If test are not called through
the make system, local defaults must be used. Not changing directories
during tests any more makes this easier.

A few files (e.g. templates, generated CRL) have been moved around to
better match the new structure.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/proxy_backend.bash

    re24eed6 r33af2b7  
    1212    export BACKEND_PORT="9934"
    1313fi
    14 if [ -z "${BACKEND_LOCK}" ] && [ -n "${testdir}" ]; then
    15     BACKEND_LOCK="$(realpath ${testdir}/../../backend.lock)"
    16 fi
     14: ${BACKEND_LOCK:="backend.lock"}
     15: ${srcdir:="."}
    1716
    1817function backend_apache
     
    3231        export TEST_IP="${BACKEND_IP}"
    3332        export TEST_PORT="${BACKEND_PORT}"
     33        export srcdir="$(realpath ${srcdir})"
    3434        case $action in
    3535            start)
    36                 cd "${dir}"
    3736                ${flock_cmd} \
    38                     /usr/sbin/apache2 -f "$(pwd)/${conf}" -k start || return 1
     37                    /usr/sbin/apache2 -f "$(realpath ${testdir}/${conf})" -k start || return 1
    3938                ;;
    4039            stop)
    41                 cd "${dir}"
    42                 /usr/sbin/apache2 -f "$(pwd)/${conf}" -k stop || return 1
     40                /usr/sbin/apache2 -f "$(realpath ${testdir}/${conf})" -k stop || return 1
    4341                ;;
    4442        esac
Note: See TracChangeset for help on using the changeset viewer.