Skip to content

Commit

Permalink
t/lib-httpd.sh: skip tests if NO_CURL is defined
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed May 7, 2015
1 parent 282616c commit c9d441a
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 35 deletions.
6 changes: 6 additions & 0 deletions t/lib-httpd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions t/t5539-fetch-http-shallow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
test_description='fetch/clone from a shallow clone over http'

. ./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
start_httpd

Expand Down
5 changes: 0 additions & 5 deletions t/t5541-http-push-smart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
test_description='test smart pushing over http via http-backend'
. ./test-lib.sh

if test -n "$NO_CURL"; then
skip_all='skipping test, git built without http support'
test_done
fi

ROOT_PATH="$PWD"
. "$TEST_DIRECTORY"/lib-httpd.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
Expand Down
6 changes: 0 additions & 6 deletions t/t5542-push-http-shallow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
test_description='push from/to a shallow clone over http'

. ./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
start_httpd

Expand Down
6 changes: 0 additions & 6 deletions t/t5550-http-fetch-dumb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

test_description='test dumb fetching over http via static file'
. ./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
start_httpd

Expand Down
6 changes: 0 additions & 6 deletions t/t5551-http-fetch-smart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

test_description='test smart fetching over http via http-backend'
. ./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
start_httpd

Expand Down
6 changes: 0 additions & 6 deletions t/t5561-http-backend.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

test_description='test git-http-backend'
. ./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
start_httpd

Expand Down

0 comments on commit c9d441a

Please sign in to comment.