diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2012-01-08 22:06:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-08 14:27:29 -0800 |
| commit | d336572f57e398318a0f6c51cc760d5be9872cc2 (patch) | |
| tree | 8907075c3313404189b4ac93450dd0ff385f765b | |
| parent | c207e34f7733df04342e1c0f449f6d3cae501e33 (diff) | |
| download | git-d336572f57e398318a0f6c51cc760d5be9872cc2.tar.gz git-d336572f57e398318a0f6c51cc760d5be9872cc2.tar.xz | |
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>
| -rwxr-xr-x | t/t5541-http-push.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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' ' |