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>
Mike Hommey committed
Jul 7, 2008 at 21:02 UTC
13b5481ed8309ced4b6435bf3956713651ea31d1
2 files changed
+11
-9
t/lib-httpd.sh
+10
-8
@@ -45,22 +45,22 @@ else
45
error "Could not identify web server at '$LIB_HTTPD_PATH'"
46
fi
47
48
-HTTPD_PARA="-d $HTTPD_ROOT_PATH -f $TEST_PATH/apache.conf"
48
+HTTPD_PARA=""
49
50
prepare_httpd() {
51
- mkdir -p $HTTPD_DOCUMENT_ROOT_PATH
51
+ mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH"
52
53
- ln -s $LIB_HTTPD_MODULE_PATH $HTTPD_ROOT_PATH/modules
53
+ ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules"
54
55
if test -n "$LIB_HTTPD_SSL"
56
then
57
HTTPD_URL=https://127.0.0.1:$LIB_HTTPD_PORT
58
59
RANDFILE_PATH="$HTTPD_ROOT_PATH"/.rnd openssl req \
60
- -config $TEST_PATH/ssl.cnf \
60
+ -config "$TEST_PATH/ssl.cnf" \
61
-new -x509 -nodes \
62
- -out $HTTPD_ROOT_PATH/httpd.pem \
63
- -keyout $HTTPD_ROOT_PATH/httpd.pem
62
+ -out "$HTTPD_ROOT_PATH/httpd.pem" \
63
+ -keyout "$HTTPD_ROOT_PATH/httpd.pem"
64
GIT_SSL_NO_VERIFY=t
65
export GIT_SSL_NO_VERIFY
66
HTTPD_PARA="$HTTPD_PARA -DSSL"
@@ -86,12 +86,14 @@ start_httpd() {
86
87
trap 'stop_httpd; die' exit
88
89
- "$LIB_HTTPD_PATH" $HTTPD_PARA \
89
+ "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
90
+ -f "$TEST_PATH/apache.conf" $HTTPD_PARA \
91
-c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start
92
}
93
94
stop_httpd() {
95
trap 'die' exit
96
96
- "$LIB_HTTPD_PATH" $HTTPD_PARA -k stop
97
+ "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
98
+ -f "$TEST_PATH/apache.conf" -k stop
99
}
t/t5540-http-push.sh
+1
-1
@@ -36,7 +36,7 @@ test_expect_success 'setup remote repository' '
36
git --bare update-server-info &&
37
chmod +x hooks/post-update &&
38
cd - &&
39
- mv test_repo.git $HTTPD_DOCUMENT_ROOT_PATH
39
+ mv test_repo.git "$HTTPD_DOCUMENT_ROOT_PATH"
40
'
41
42
test_expect_success 'clone remote repository' '