From c9d441a899a96185cff7ca798dcf69af9825c2ff Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 6 May 2015 13:42:29 -0400 Subject: 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 Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/lib-httpd.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 't/lib-httpd.sh') diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 252cbf163b..872a252d58 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -30,6 +30,12 @@ # Copyright (c) 2008 Clemens Buchacher # +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 -- cgit v1.2.3 From 309a9e33731a56487944dbaa00073f8ee05c9f70 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 7 May 2015 09:06:14 -0700 Subject: tests: skip dav http-push tests under NO_EXPAT=NoThanks When built with NO_EXPAT=NoThanks, we will not have a working http-push over webdav. Signed-off-by: Junio C Hamano --- t/lib-httpd.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 't/lib-httpd.sh') diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 872a252d58..d823664c57 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -36,6 +36,12 @@ then test_done fi +if test -n "$NO_EXPAT" && test -n "$LIB_HTTPD_DAV" +then + skip_all='skipping test, git built without expat support' + test_done +fi + test_tristate GIT_TEST_HTTPD if test "$GIT_TEST_HTTPD" = false then -- cgit v1.2.3