[PATCH 01/14] t/lib-httpd: check for NO_CURL
- From
Jeff King <peff@peff.net>
- Date
- Nov 10, 2011, 07:46 UTC
- Message-ID
- <20111110074600.GA27950@sigill.intra.peff.net>
- In-Reply-To
- <20111110074330.GA27925@sigill.intra.peff.net>
We already do this check individually in each of the tests that includes lib-httpd. Let's factor it out.
There is one test (t5540) that uses lib-httpd but does not currently do this check. But it actually has a stricter check which is a superset (it needs all of the requirements to have built git-http-push, one of which is not setting NO_CURL), so adding this extra check won't hurt anything.
Signed-off-by: Jeff King <peff@peff.net> --- t/lib-httpd.sh | 5 +++++ t/t5541-http-push.sh | 5 ----- t/t5550-http-fetch.sh | 5 ----- t/t5551-http-fetch.sh | 5 ----- t/t5561-http-backend.sh | 5 ----- 5 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index f7dc078..8331527 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -3,6 +3,11 @@ # Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at> # +if test -n "$NO_CURL"; then + skip_all='skipping test, git built without http support' + test_done +fi + if test -z "$GIT_TEST_HTTPD" then skip_all="Network testing disabled (define GIT_TEST_HTTPD to enable)" diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index a73c826..a326ee0 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -6,11 +6,6 @@ test_description='test smart pushing over http via http-backend' . ./test-lib.sh -if test -n "$NO_CURL"; then - skip_all='skipping test, git built without http support' - test_done -fi - ROOT_PATH="$PWD" LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5541'} . "$TEST_DIRECTORY"/lib-httpd.sh diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh index 311a33c..e9282c5 100755 --- a/t/t5550-http-fetch.sh +++ b/t/t5550-http-fetch.sh @@ -3,11 +3,6 @@ test_description='test dumb fetching over http via static file' . ./test-lib.sh -if test -n "$NO_CURL"; then - skip_all='skipping test, git built without http support' - test_done -fi - LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5550'} . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index 26d3557..3557f2e 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -3,11 +3,6 @@ test_description='test smart fetching over http via http-backend' . ./test-lib.sh -if test -n "$NO_CURL"; then - skip_all='skipping test, git built without http support' - test_done -fi - LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5551'} . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh index b5d7fbc..974be7c 100755 --- a/t/t5561-http-backend.sh +++ b/t/t5561-http-backend.sh @@ -3,11 +3,6 @@ test_description='test git-http-backend' . ./test-lib.sh -if test -n "$NO_CURL"; then - skip_all='skipping test, git built without http support' - test_done -fi - LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5561'} . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd
-- 1.7.7.2.7.g9f96f