[PATCH v6 1/7] tests: test number comes first in 'not ok $count - $message'
- From
Adam Spiers <git@adamspiers.org>
- Date
- Dec 16, 2012, 18:28 UTC
- Message-ID
- <1355682495-22382-2-git-send-email-git@adamspiers.org>
- In-Reply-To
- <1355682495-22382-1-git-send-email-git@adamspiers.org>
The old output to say "not ok - 1 messsage" was working by accident only because the test numbers are optional in TAP.
Signed-off-by: Adam Spiers <git@adamspiers.org> --- t/t0000-basic.sh | 4 ++-- t/test-lib.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 562cf41..46ccda3 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -189,13 +189,13 @@ test_expect_success 'tests clean up even on failures' " ! test -s err && ! test -f \"trash directory.failing-cleanup/clean-after-failure\" && sed -e 's/Z$//' -e 's/^> //' >expect <<-\\EOF && - > not ok - 1 tests clean up even after a failure + > not ok 1 - tests clean up even after a failure > # Z > # touch clean-after-failure && > # test_when_finished rm clean-after-failure && > # (exit 1) > # Z - > not ok - 2 failure to clean up causes the test to fail + > not ok 2 - failure to clean up causes the test to fail > # Z > # test_when_finished \"(exit 2)\" > # Z diff --git a/t/test-lib.sh b/t/test-lib.sh index f50f834..d0b236f 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -298,7 +298,7 @@ test_ok_ () { test_failure_ () { test_failure=$(($test_failure + 1)) - say_color error "not ok - $test_count $1" + say_color error "not ok $test_count - $1" shift echo "$@" | sed -e 's/^/# /' test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }
-- 1.7.12.1.396.g53b3ea9