mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
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>
This commit is contained in:
parent
b5cd2d1e92
commit
13b5481ed8
|
@ -45,22 +45,22 @@ else
|
||||||
error "Could not identify web server at '$LIB_HTTPD_PATH'"
|
error "Could not identify web server at '$LIB_HTTPD_PATH'"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
HTTPD_PARA="-d $HTTPD_ROOT_PATH -f $TEST_PATH/apache.conf"
|
HTTPD_PARA=""
|
||||||
|
|
||||||
prepare_httpd() {
|
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"
|
if test -n "$LIB_HTTPD_SSL"
|
||||||
then
|
then
|
||||||
HTTPD_URL=https://127.0.0.1:$LIB_HTTPD_PORT
|
HTTPD_URL=https://127.0.0.1:$LIB_HTTPD_PORT
|
||||||
|
|
||||||
RANDFILE_PATH="$HTTPD_ROOT_PATH"/.rnd openssl req \
|
RANDFILE_PATH="$HTTPD_ROOT_PATH"/.rnd openssl req \
|
||||||
-config $TEST_PATH/ssl.cnf \
|
-config "$TEST_PATH/ssl.cnf" \
|
||||||
-new -x509 -nodes \
|
-new -x509 -nodes \
|
||||||
-out $HTTPD_ROOT_PATH/httpd.pem \
|
-out "$HTTPD_ROOT_PATH/httpd.pem" \
|
||||||
-keyout $HTTPD_ROOT_PATH/httpd.pem
|
-keyout "$HTTPD_ROOT_PATH/httpd.pem"
|
||||||
GIT_SSL_NO_VERIFY=t
|
GIT_SSL_NO_VERIFY=t
|
||||||
export GIT_SSL_NO_VERIFY
|
export GIT_SSL_NO_VERIFY
|
||||||
HTTPD_PARA="$HTTPD_PARA -DSSL"
|
HTTPD_PARA="$HTTPD_PARA -DSSL"
|
||||||
|
@ -86,12 +86,14 @@ start_httpd() {
|
||||||
|
|
||||||
trap 'stop_httpd; die' exit
|
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
|
-c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start
|
||||||
}
|
}
|
||||||
|
|
||||||
stop_httpd() {
|
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" -k stop
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ test_expect_success 'setup remote repository' '
|
||||||
git --bare update-server-info &&
|
git --bare update-server-info &&
|
||||||
chmod +x hooks/post-update &&
|
chmod +x hooks/post-update &&
|
||||||
cd - &&
|
cd - &&
|
||||||
mv test_repo.git $HTTPD_DOCUMENT_ROOT_PATH
|
mv test_repo.git "$HTTPD_DOCUMENT_ROOT_PATH"
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'clone remote repository' '
|
test_expect_success 'clone remote repository' '
|
||||||
|
|
Loading…
Reference in a new issue