summaryrefslogtreecommitdiff
path: root/t/t5541-http-push.sh
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2012-01-08 21:06:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-01-08 22:27:29 (GMT)
commitd336572f57e398318a0f6c51cc760d5be9872cc2 (patch)
tree8907075c3313404189b4ac93450dd0ff385f765b /t/t5541-http-push.sh
parentc207e34f7733df04342e1c0f449f6d3cae501e33 (diff)
downloadgit-d336572f57e398318a0f6c51cc760d5be9872cc2.zip
git-d336572f57e398318a0f6c51cc760d5be9872cc2.tar.gz
git-d336572f57e398318a0f6c51cc760d5be9872cc2.tar.bz2
t5541: avoid TAP test miscounting
lib-terminal.sh runs a test and thus increases the test count, but the output is lost so that TAP produces a "no plan found error". Move the lib-terminal call after the lib-httpd and make TAP happy (though still leave me clueless). Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5541-http-push.sh')
-rwxr-xr-xt/t5541-http-push.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 0c3cd3b..6c9ec6f 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -5,7 +5,6 @@
test_description='test smart pushing over http via http-backend'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-terminal.sh
if test -n "$NO_CURL"; then
skip_all='skipping test, git built without http support'
@@ -15,6 +14,7 @@ fi
ROOT_PATH="$PWD"
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5541'}
. "$TEST_DIRECTORY"/lib-httpd.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
start_httpd
test_expect_success 'setup remote repository' '