add basic http clone/fetch tests

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index a5c4436fd104e93ca74b11e11bc98238aaf83b29..589aaf82149916c43d42fad488567e34b26aebaa 100644 (file)
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -11,18 +11,32 @@ then
        exit
 fi
 
-LIB_HTTPD_PATH=${LIB_HTTPD_PATH-'/usr/sbin/apache2'}
+HTTPD_PARA=""
+
+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"}
 LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'8111'}
 
-TEST_PATH="$PWD"/../lib-httpd
+TEST_PATH="$TEST_DIRECTORY"/lib-httpd
 HTTPD_ROOT_PATH="$PWD"/httpd
 HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
 
 if ! test -x "$LIB_HTTPD_PATH"
 then
-        say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
-        test_done
-        exit
+       say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
+       test_done
+       exit
 fi
 
 HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
@@ -39,28 +53,26 @@ then
                        exit
                fi
 
-               LIB_HTTPD_MODULE_PATH='/usr/lib/apache2/modules'
+               LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
        fi
 else
        error "Could not identify web server at '$LIB_HTTPD_PATH'"
 fi
 
-HTTPD_PARA="-d $HTTPD_ROOT_PATH -f $TEST_PATH/apache.conf"
-
 prepare_httpd() {
-       mkdir -p $HTTPD_DOCUMENT_ROOT_PATH
+       mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH"
 
-       ln -s $LIB_HTTPD_MODULE_PATH $HTTPD_ROOT_PATH/modules
+       ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules"
 
        if test -n "$LIB_HTTPD_SSL"
        then
                HTTPD_URL=https://127.0.0.1:$LIB_HTTPD_PORT
 
                RANDFILE_PATH="$HTTPD_ROOT_PATH"/.rnd openssl req \
-                       -config $TEST_PATH/ssl.cnf \
+                       -config "$TEST_PATH/ssl.cnf" \
                        -new -x509 -nodes \
-                       -out $HTTPD_ROOT_PATH/httpd.pem \
-                       -keyout $HTTPD_ROOT_PATH/httpd.pem
+                       -out "$HTTPD_ROOT_PATH/httpd.pem" \
+                       -keyout "$HTTPD_ROOT_PATH/httpd.pem"
                GIT_SSL_NO_VERIFY=t
                export GIT_SSL_NO_VERIFY
                HTTPD_PARA="$HTTPD_PARA -DSSL"
@@ -82,16 +94,23 @@ prepare_httpd() {
 }
 
 start_httpd() {
-       prepare_httpd
+       prepare_httpd >&3 2>&4
 
-       trap 'stop_httpd; die' exit
+       trap 'stop_httpd; die' EXIT
 
-       "$LIB_HTTPD_PATH" $HTTPD_PARA \
-               -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start
+       "$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 \
+               >&3 2>&4
+       if ! test $? = 0; then
+               say "skipping test, web server setup failed"
+               test_done
+       fi
 }
 
 stop_httpd() {
-       trap 'die' exit
+       trap 'die' EXIT
 
-       "$LIB_HTTPD_PATH" $HTTPD_PARA -k stop
+       "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
+               -f "$TEST_PATH/apache.conf" $HTTPD_PARA -k stop
 }