aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2009-10-30 17:47:45 -0700
committerJunio C Hamano <gitster@pobox.com>2009-11-04 17:58:16 -0800
commit859d1fb427ca79d3c70a3806c892e4dd148701bf (patch)
tree77699c31cf1fed64d808870f2b74e811a27e9491
parenteeb3aeddb23746912b6c903a7d90dffdd686708f (diff)
downloadgit-859d1fb427ca79d3c70a3806c892e4dd148701bf.tar.gz
git-859d1fb427ca79d3c70a3806c892e4dd148701bf.tar.xz
set httpd port before sourcing lib-httpd
If LIB_HTTPD_PORT is not set already, lib-httpd will set it to the default 8111. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5540-http-push.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index 28a746e5b..d1234f9fe 100755
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -9,17 +9,16 @@ This test runs various sanity checks on http-push.'
. ./test-lib.sh
-ROOT_PATH="$PWD"
-LIB_HTTPD_DAV=t
-LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5540'}
-
if git http-push > /dev/null 2>&1 || [ $? -eq 128 ]
then
say "skipping test, USE_CURL_MULTI is not defined"
test_done
fi
+LIB_HTTPD_DAV=t
+LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5540'}
. "$TEST_DIRECTORY"/lib-httpd.sh
+ROOT_PATH="$PWD"
start_httpd
test_expect_success 'setup remote repository' '