Changeset af7da2d in mod_gnutls for test


Ignore:
Timestamp:
May 18, 2015, 1:31:17 AM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
a2e3c33
Parents:
c5d5942
Message:

Test suite: Start Apache directly again, search for httpd

Fedora installs a version of apachectl that does not pass arguments
through to Apache and relies on the system wide configuration. Thus
running the test suite there requires calling the Apache binary
directly. Search for it as "apache2" (name used in Debian) as well as
"httpd" (Fedora).

Also include test/cgi_module.conf and test/proxy_mods.conf in the
distribution archive.

Location:
test
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    rc5d5942 raf7da2d  
    6161cert_templates = authority.template.in client.template.in \
    6262        imposter.template.in rogueca.template server.template.in
    63 apache_data = base_apache.conf data/* mime.types
     63apache_data = base_apache.conf cgi_module.conf data/* mime.types proxy_mods.conf
    6464
    6565EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in proxy_backend.bash \
     
    6767        TestMakefile
    6868
    69 AM_TESTS_ENVIRONMENT = export APACHECTL=$(APACHECTL); \
     69AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
    7070        export AP_LIBEXECDIR=$(AP_LIBEXECDIR);
  • test/TestMakefile

    rc5d5942 raf7da2d  
    77
    88export srcdir ?= .
    9 # try default PATH for apachectl if missing (should only happen when
    10 # the test script is run manually)
    11 export APACHECTL ?= apachectl
     9# If the Apache binary is not set, try to find apache2 in default PATH
     10# (should only happen when the test script is run manually)
     11export APACHE2 ?= apache2
    1212
    1313export TEST_HOST ?= localhost
  • test/proxy_backend.bash

    rc5d5942 raf7da2d  
    1414: ${BACKEND_LOCK:="backend.lock"}
    1515: ${srcdir:="."}
    16 : ${APACHECTL:="apachectl"}
     16: ${APACHE2:="apache2"}
    1717
    1818function backend_apache
     
    3636            start)
    3737                ${flock_cmd} \
    38                     ${APACHECTL} -f "$(realpath ${testdir}/${conf})" -k start || return 1
     38                    ${APACHE2} -f "$(realpath ${testdir}/${conf})" -k start || return 1
    3939                ;;
    4040            stop)
    41                 ${APACHECTL} -f "$(realpath ${testdir}/${conf})" -k stop || return 1
     41                ${APACHE2} -f "$(realpath ${testdir}/${conf})" -k stop || return 1
    4242                ;;
    4343        esac
  • test/runtests

    rc5d5942 raf7da2d  
    1313
    1414BADVARS=0
    15 for v in APACHECTL TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_GAP MSVA_PORT; do
     15for v in APACHE2 TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_GAP MSVA_PORT; do
    1616    if [ ! -v "$v" ]; then
    1717        printf "You need to set the %s environment variable\n" "$v" >&2
     
    8080function apache_down_err() {
    8181    printf "FAILURE: %s\n" "$TEST_NAME"
    82     ${APACHECTL} -f "${t}/apache.conf" -k stop || true
     82    ${APACHE2} -f "${t}/apache.conf" -k stop || true
    8383    if [ -e output ]; then
    8484        printf "\ngnutls-cli outputs:\n"
     
    139139        MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" \
    140140            ${flock_cmd} \
    141             ${APACHECTL} -f "${t}/apache.conf" -k start \
     141            ${APACHE2} -f "${t}/apache.conf" -k start \
    142142            || [ -e "${t}/fail.server" ]
    143143    else
    144144        ${flock_cmd} \
    145             ${APACHECTL} -f "${t}/apache.conf" -k start \
     145            ${APACHE2} -f "${t}/apache.conf" -k start \
    146146            || [ -e "${t}/fail.server" ]
    147147    fi
     
    183183        trap - EXIT
    184184    fi
    185     ${APACHECTL} -f "${t}/apache.conf" -k stop || [ -e ${t}/fail.server ]
     185    ${APACHE2} -f "${t}/apache.conf" -k stop || [ -e ${t}/fail.server ]
    186186    printf "SUCCESS: %s\n" "$TEST_NAME"
    187187done
Note: See TracChangeset for help on using the changeset viewer.