Code

t5541: avoid TAP test miscounting
authorMichael J Gruber <git@drmicha.warpmail.net>
Sun, 8 Jan 2012 21:06:21 +0000 (22:06 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 8 Jan 2012 22:27:29 +0000 (14:27 -0800)
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>
t/t5541-http-push.sh

index 0c3cd3b4dd73c7886ffc69641787d28638d86db2..6c9ec6f1171ab39c115230a4b6bb6be3780577c9 100755 (executable)
@@ -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' '