diff options
| author |  Mike Hommey <mh@glandium.org> | 2008-07-07 21:02:37 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-08 22:49:42 -0700 |
| commit | 13b5481ed8309ced4b6435bf3956713651ea31d1 (patch) | |
| tree | c23b4bc69a1a274a4b3da1f26902d22fa28ce4d4 /t | |
| parent | Catch failures from t5540-http-push (diff) | |
| download | tgif-13b5481ed8309ced4b6435bf3956713651ea31d1.tar.xz | |
Fix http-push test
http-push test has been broken by 4a7aaccd adding a space character
in the place where the test is being run.
Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-httpd.sh | 18 | ||||
| -rwxr-xr-x | t/t5540-http-push.sh | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index a5c4436fd1..dc473dfb53 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -45,22 +45,22 @@ else error "Could not identify web server at '$LIB_HTTPD_PATH'" fi -HTTPD_PARA="-d $HTTPD_ROOT_PATH -f $TEST_PATH/apache.conf" +HTTPD_PARA="" 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" @@ -86,12 +86,14 @@ start_httpd() { trap 'stop_httpd; die' exit - "$LIB_HTTPD_PATH" $HTTPD_PARA \ + "$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 } stop_httpd() { trap 'die' exit - "$LIB_HTTPD_PATH" $HTTPD_PARA -k stop + "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ + -f "$TEST_PATH/apache.conf" -k stop } diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh index 0e70355c4c..ee63945c99 100755 --- a/t/t5540-http-push.sh +++ b/t/t5540-http-push.sh @@ -36,7 +36,7 @@ test_expect_success 'setup remote repository' ' git --bare update-server-info && chmod +x hooks/post-update && cd - && - mv test_repo.git $HTTPD_DOCUMENT_ROOT_PATH + mv test_repo.git "$HTTPD_DOCUMENT_ROOT_PATH" ' test_expect_success 'clone remote repository' ' |