[PATCH v5 26/28] set httpd port before sourcing lib-httpd
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:47:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Clemens Buchacher <redacted> If LIB_HTTPD_PORT is not set already, lib-httpd will set it to the default 8111. Signed-off-by: Clemens Buchacher <redacted> Signed-off-by: Shawn O. Pearce <redacted> --- t/t5540-http-push.sh | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index 28a746e..d1234f9 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' '
--
1.6.5.2.181.gd6f41