From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Sun, 8 Jan 2012 21:06:21 +0000 (+0100)
Subject: t5541: avoid TAP test miscounting
X-Git-Tag: v1.7.9.1~23^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d336572f57e398318a0f6c51cc760d5be9872cc2;p=git.git

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>
---

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 0c3cd3b4d..6c9ec6f11 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' '