mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jeff King
2015-05-06 13:42:29 -04:00
committed by Junio C Hamano
parent 282616c72d
commit c9d441a899
7 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/lib-httpd.sh
View File

@ -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 test_tristate GIT_TEST_HTTPD
if test "$GIT_TEST_HTTPD" = false if test "$GIT_TEST_HTTPD" = false
then then

6
t/t5539-fetch-http-shallow.sh
View File

@ -3,12 +3,6 @@
test_description='fetch/clone from a shallow clone over http' test_description='fetch/clone from a shallow clone over http'
. ./test-lib.sh . ./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 . "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd start_httpd

5
t/t5541-http-push-smart.sh
View File

@ -6,11 +6,6 @@
test_description='test smart pushing over http via http-backend' test_description='test smart pushing over http via http-backend'
. ./test-lib.sh . ./test-lib.sh
if test -n "$NO_CURL"; then
skip_all='skipping test, git built without http support'
test_done
fi
ROOT_PATH="$PWD" ROOT_PATH="$PWD"
. "$TEST_DIRECTORY"/lib-httpd.sh . "$TEST_DIRECTORY"/lib-httpd.sh
. "$TEST_DIRECTORY"/lib-terminal.sh . "$TEST_DIRECTORY"/lib-terminal.sh

6
t/t5542-push-http-shallow.sh
View File

@ -3,12 +3,6 @@
test_description='push from/to a shallow clone over http' test_description='push from/to a shallow clone over http'
. ./test-lib.sh . ./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 . "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd start_httpd

6
t/t5550-http-fetch-dumb.sh
View File

@ -2,12 +2,6 @@
test_description='test dumb fetching over http via static file' test_description='test dumb fetching over http via static file'
. ./test-lib.sh . ./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 . "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd start_httpd

6
t/t5551-http-fetch-smart.sh
View File

@ -2,12 +2,6 @@
test_description='test smart fetching over http via http-backend' test_description='test smart fetching over http via http-backend'
. ./test-lib.sh . ./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 . "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd start_httpd

6
t/t5561-http-backend.sh
View File

@ -2,12 +2,6 @@
test_description='test git-http-backend' test_description='test git-http-backend'
. ./test-lib.sh . ./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 . "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd start_httpd