diff options
| author |  Jeff King <peff@peff.net> | 2018-04-03 10:01:57 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-04-05 16:21:41 +0900 |
| commit | e9184b0789abdcc701e75d731bfd2b126b599490 (patch) | |
| tree | aa030825ad5c893467cf92cba572208e3135c256 | |
| parent | t5561: drop curl stderr redirects (diff) | |
| download | tgif-e9184b0789abdcc701e75d731bfd2b126b599490.tar.xz | |
t5561: skip tests if curl is not available
It's possible to have libcurl installed but not the curl
command-line utility. The latter is not generally needed for
Git's http support, but we use it in t5561 for basic tests
of http-backend's functionality. Let's detect when it's
missing and skip this test.
Note that we can't mark the individual tests with the CURL
prerequisite. They're in a shared t556x_common that uses the
GET and POST functions as a level of indirection, and it's
only our implementations of those functions in t5561 that
requires curl. It's not a problem, though, as literally
every test in the script would depend on the prerequisite
anyway.
Reported-by: Jens Krüger <Jens.Krueger@frm2.tum.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5561-http-backend.sh | 6 | ||||
| -rw-r--r-- | t/test-lib.sh | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh index 6167563986..84a955770a 100755 --- a/t/t5561-http-backend.sh +++ b/t/t5561-http-backend.sh @@ -3,6 +3,12 @@ test_description='test git-http-backend' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-httpd.sh + +if ! test_have_prereq CURL; then + skip_all='skipping raw http-backend tests, curl not available' + test_done +fi + start_httpd GET() { diff --git a/t/test-lib.sh b/t/test-lib.sh index 816e692391..db91875297 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1187,3 +1187,7 @@ test_lazy_prereq LONG_IS_64BIT ' test_lazy_prereq TIME_IS_64BIT 'test-date is64bit' test_lazy_prereq TIME_T_IS_64BIT 'test-date time_t-is64bit' + +test_lazy_prereq CURL ' + curl --version +' |