diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:44 -0700 |
| commit | 8087a620863dde1c589f072abd4e6b9ef1017a62 (patch) | |
| tree | f90fa9e990232e691a39499bf5b87c5afa7a13c0 /t/lib-httpd.sh | |
| parent | 6263f58f86895096c21a07ad8dced76f84bd4708 (diff) | |
| parent | 309a9e33731a56487944dbaa00073f8ee05c9f70 (diff) | |
| download | git-8087a620863dde1c589f072abd4e6b9ef1017a62.tar.gz | |
Merge branch 'jk/skip-http-tests-under-no-curl'
Test clean-up.
* jk/skip-http-tests-under-no-curl:
tests: skip dav http-push tests under NO_EXPAT=NoThanks
t/lib-httpd.sh: skip tests if NO_CURL is defined
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index e6adf2f82d..e9714467d0 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -30,6 +30,18 @@ # 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 -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 |