Merge branch 'jc/conflict-marker-size'

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 86cdebc727c4964899a71366151a7782558153c7..28aff887b5a92ec5919f4005010ef64f85d908e9 100644 (file)
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -8,21 +8,33 @@ then
        say "skipping test, network testing disabled by default"
        say "(define GIT_TEST_HTTPD to enable)"
        test_done
-       exit
 fi
 
 HTTPD_PARA=""
 
+for DEFAULT_HTTPD_PATH in '/usr/sbin/httpd' '/usr/sbin/apache2'
+do
+       if test -x "$DEFAULT_HTTPD_PATH"
+       then
+               break
+       fi
+done
+
+for DEFAULT_HTTPD_MODULE_PATH in '/usr/libexec/apache2' \
+                                '/usr/lib/apache2/modules' \
+                                '/usr/lib64/httpd/modules' \
+                                '/usr/lib/httpd/modules'
+do
+       if test -d "$DEFAULT_HTTPD_MODULE_PATH"
+       then
+               break
+       fi
+done
+
 case $(uname) in
        Darwin)
-               DEFAULT_HTTPD_PATH='/usr/sbin/httpd'
-               DEFAULT_HTTPD_MODULE_PATH='/usr/libexec/apache2'
                HTTPD_PARA="$HTTPD_PARA -DDarwin"
        ;;
-       *)
-               DEFAULT_HTTPD_PATH='/usr/sbin/apache2'
-               DEFAULT_HTTPD_MODULE_PATH='/usr/lib/apache2/modules'
-       ;;
 esac
 
 LIB_HTTPD_PATH=${LIB_HTTPD_PATH-"$DEFAULT_HTTPD_PATH"}
@@ -36,7 +48,6 @@ if ! test -x "$LIB_HTTPD_PATH"
 then
        say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
        test_done
-       exit
 fi
 
 HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
@@ -50,7 +61,11 @@ then
                then
                        say "skipping test, at least Apache version 2 is required"
                        test_done
-                       exit
+               fi
+               if ! test -d "$DEFAULT_HTTPD_MODULE_PATH"
+               then
+                       say "Apache module directory not found.  Skipping tests."
+                       test_done
                fi
 
                LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
@@ -94,13 +109,20 @@ prepare_httpd() {
 }
 
 start_httpd() {
-       prepare_httpd
+       prepare_httpd >&3 2>&4
 
-       trap 'stop_httpd; die' EXIT
+       trap 'code=$?; stop_httpd; (exit $code); die' EXIT
 
        "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
                -f "$TEST_PATH/apache.conf" $HTTPD_PARA \
-               -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start
+               -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \
+               >&3 2>&4
+       if test $? -ne 0
+       then
+               say "skipping test, web server setup failed"
+               trap 'die' EXIT
+               test_done
+       fi
 }
 
 stop_httpd() {