aboutsummaryrefslogtreecommitdiff
path: root/t/lib-httpd.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-05-06 13:42:29 -0400
committerJunio C Hamano <gitster@pobox.com>2015-05-07 08:26:02 -0700
commitc9d441a899a96185cff7ca798dcf69af9825c2ff (patch)
tree8ad37b7e65747965f29b6cac3b70ad573480646c /t/lib-httpd.sh
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
downloadgit-c9d441a899a96185cff7ca798dcf69af9825c2ff.tar.gz
git-c9d441a899a96185cff7ca798dcf69af9825c2ff.tar.xz
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>
Diffstat (limited to 't/lib-httpd.sh')
-rw-r--r--t/lib-httpd.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 252cbf163..872a252d5 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -30,6 +30,12 @@
# 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