t/lib-httpd.sh: skip tests if NO_CURL is defined

If we built git without curl, we can't actually test against
an http server. In fact, all of the test scripts which
include lib-httpd.sh already perform this check, with one
exception: t5540. For those scripts, this is a noop, and for
t5540, this is a bugfix (it used to fail when built with
NO_CURL, though it could go unnoticed if you had a stale
git-remote-https in your build directory).

Noticed-by: Junio C Hamano <junio@pobox.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 252cbf163bcff90aabe39a48219e00565f577ffe..872a252d580a8c3a7001f551d08c028f35dcf410 100644 (file)
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -30,6 +30,12 @@
 # Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
 #
 
 # 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
+

 test_tristate GIT_TEST_HTTPD
 if test "$GIT_TEST_HTTPD" = false
 then
 test_tristate GIT_TEST_HTTPD
 if test "$GIT_TEST_HTTPD" = false
 then

diff --git a/t/t5539-fetch-http-shallow.sh b/t/t5539-fetch-http-shallow.sh
index 94553e103968433aa55fd882a3006b375999759e..f1cbf966993861c005624542aafadc280312486e 100755 (executable)
--- a/t/t5539-fetch-http-shallow.sh
+++ b/t/t5539-fetch-http-shallow.sh
@@ -3,12 +3,6 @@
 test_description='fetch/clone from a shallow clone over http'
 
 . ./test-lib.sh
 test_description='fetch/clone from a shallow clone over http'
 
 . ./test-lib.sh

-
-if test -n "$NO_CURL"; then
-       skip_all='skipping test, git built without http support'
-       test_done
-fi
-

 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 

diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index 73af16f481836d3cbfa8a2f82c260d10a3a43c09..2d378f5afcf3abde71e0bb52dc73a76132984af2 100755 (executable)
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -6,11 +6,6 @@
 test_description='test smart pushing over http via http-backend'
 . ./test-lib.sh
 
 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"
 . "$TEST_DIRECTORY"/lib-httpd.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 ROOT_PATH="$PWD"
 . "$TEST_DIRECTORY"/lib-httpd.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh

diff --git a/t/t5542-push-http-shallow.sh b/t/t5542-push-http-shallow.sh
index 2a691e09ebe5f35e5a1aff6c710e6b4dc525f0d6..51658331571611c568def54be28072f426c48e66 100755 (executable)
--- a/t/t5542-push-http-shallow.sh
+++ b/t/t5542-push-http-shallow.sh
@@ -3,12 +3,6 @@
 test_description='push from/to a shallow clone over http'
 
 . ./test-lib.sh
 test_description='push from/to a shallow clone over http'
 
 . ./test-lib.sh

-
-if test -n "$NO_CURL"; then
-       say 'skipping test, git built without http support'
-       test_done
-fi
-

 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 

diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index 1a3a2b6c1a20558a019143d1abbd2168af0caf53..2d9249cf90e6c6770cc282a7c7159d343d7aa0d4 100755 (executable)
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -2,12 +2,6 @@
 
 test_description='test dumb fetching over http via static file'
 . ./test-lib.sh
 
 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
-

 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 

diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index e07eaf35f118893da9240f12d115da1affd5eb05..7c27edb17d6617e9b02cc7cf8d55102fdc492b3f 100755 (executable)
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -2,12 +2,6 @@
 
 test_description='test smart fetching over http via http-backend'
 . ./test-lib.sh
 
 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
-

 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 

diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh
index d23fb0238483520e77004a208f15db808941b4af..19afe966986cdc72cf8fc23f113bd77a8128f382 100755 (executable)
--- a/t/t5561-http-backend.sh
+++ b/t/t5561-http-backend.sh
@@ -2,12 +2,6 @@
 
 test_description='test git-http-backend'
 . ./test-lib.sh
 
 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
-

 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd