diff options
| author |  Adam Spiers <git@adamspiers.org> | 2012-12-16 18:28:09 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-12-16 12:01:58 -0800 |
| commit | 5e5c006eb713b785c6761c32b907e02abc277f9a (patch) | |
| tree | 77d8eb3a447bfd383e5ecaf25c77646c4d52ebc8 | |
| parent | Update draft release notes to 1.8.0 (diff) | |
| download | tgif-5e5c006eb713b785c6761c32b907e02abc277f9a.tar.xz | |
tests: test number comes first in 'not ok $count - $message'
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t0000-basic.sh | 4 | ||||
| -rw-r--r-- | 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 ae6a3f0777..c6b42deef9 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -167,13 +167,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 f8e3733ea0..03b86b821d 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -268,7 +268,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; } |