Changeset 52c3f68 in mod_gnutls

Timestamp:

May 16, 2015, 6:26:44 AM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, proxy-ticket, upstream

Children:

7813802

Parents:

03295a9

Message:

Detect apache(2?)ctl and use it instead of starting Apache directly

This should help with portability across distributions that install the
Apache binary under different paths.

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/TestMakefile (modified) (1 diff)
• test/proxy_backend.bash (modified) (2 diffs)
• test/runtests (modified) (4 diffs)

configure.ac

@@ -93 +93 @@
                                test "$PDFLATEX" != "no"])
 
+# Check for apache2ctl or apachectl
+AC_PATH_PROGS([APACHECTL], [apache2ctl apachectl], [no])
+if test "${APACHECTL}" = "no"; then
+        AC_MSG_WARN([Neither apache2ctl nor apachectl found in \
+                     PATH. Test suite will fail.])
+fi
+
 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"

test/Makefile.am

@@ -66 +66 @@
         runtests server-crl.template server-softhsm.conf softhsm.bash \
         TestMakefile
+
+AM_TESTS_ENVIRONMENT = export APACHECTL=$(APACHECTL);

test/TestMakefile

@@ -7 +7 @@
 
 export srcdir ?= .
+# try default PATH for apachectl if missing (should only happen when
+# the test script is run manually)
+export APACHECTL ?= apachectl
 
 export TEST_HOST ?= localhost

test/proxy_backend.bash

@@ -14 +14 @@
 : ${BACKEND_LOCK:="backend.lock"}
 : ${srcdir:="."}
+: ${APACHECTL:="apachectl"}
 
 function backend_apache
@@ -35 +36 @@
             start)
                 ${flock_cmd} \
-                    /usr/sbin/apache2 -f "$(realpath ${testdir}/${conf})" -k start || return 1
+                    ${APACHECTL} -f "$(realpath ${testdir}/${conf})" -k start || return 1
                 ;;
             stop)
-                /usr/sbin/apache2 -f "$(realpath ${testdir}/${conf})" -k stop || return 1
+                ${APACHECTL} -f "$(realpath ${testdir}/${conf})" -k stop || return 1
                 ;;
         esac

test/runtests

@@ -13 +13 @@
 
 BADVARS=0
-for v in TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_GAP MSVA_PORT; do
+for v in APACHECTL TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_GAP MSVA_PORT; do
     if [ ! -v "$v" ]; then
         printf "You need to set the %s environment variable\n" "$v" >&2
@@ -80 +80 @@
 function apache_down_err() {
     printf "FAILURE: %s\n" "$TEST_NAME"
-    /usr/sbin/apache2 -f "${t}/apache.conf" -k stop || true
+    ${APACHECTL} -f "${t}/apache.conf" -k stop || true
     if [ -e output ]; then
         printf "\ngnutls-cli outputs:\n"
@@ -139 +139 @@
         MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" \
             ${flock_cmd} \
-            /usr/sbin/apache2 -f "${t}/apache.conf" -k start \
+            ${APACHECTL} -f "${t}/apache.conf" -k start \
             || [ -e "${t}/fail.server" ]
     else
         ${flock_cmd} \
-            /usr/sbin/apache2 -f "${t}/apache.conf" -k start \
+            ${APACHECTL} -f "${t}/apache.conf" -k start \
             || [ -e "${t}/fail.server" ]
     fi
@@ -183 +183 @@
         trap - EXIT
     fi
-    /usr/sbin/apache2 -f "${t}/apache.conf" -k stop || [ -e ${t}/fail.server ]
+    ${APACHECTL} -f "${t}/apache.conf" -k stop || [ -e ${t}/fail.server ]
     printf "SUCCESS: %s\n" "$TEST_NAME"
 done