git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Adam Spiers <git@adamspiers.org>
To: git list <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH v2 2/6] Make 'not ok $count - $message' consistent with 'ok $count - $message'
Date: Wed, 19 Sep 2012 18:15:11 +0100	[thread overview]
Message-ID: <1348074915-19985-3-git-send-email-git@adamspiers.org> (raw)
In-Reply-To: <1348074915-19985-1-git-send-email-git@adamspiers.org>

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(-)
 mode change 100644 => 100755 t/test-lib.sh

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index ae6a3f0..c6b42de 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
old mode 100644
new mode 100755
index 426820e..5293830
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -270,7 +270,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.147.g6d168f4

  parent reply	other threads:[~2012-09-19 17:15 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-17 11:50 [PATCH] Make test output coloring more intuitive Adam Spiers
2012-09-17 20:11 ` Jeff King
2012-09-18 21:21   ` Adam Spiers
2012-09-19 20:02   ` Stefano Lattarini
2012-09-19 20:12     ` Adam Spiers
2012-09-19 20:13       ` Jeff King
2012-09-19 20:24         ` [PATCH v4 3/6] Color skipped tests blue Adam Spiers
2012-09-20  5:48           ` Johannes Sixt
2012-09-20  9:04             ` Adam Spiers
2012-09-20  9:08             ` [PATCH v5 3/3] Color skipped tests bold blue Adam Spiers
2012-09-20 10:08               ` Stefano Lattarini
2012-09-20 16:20                 ` Junio C Hamano
2012-09-21  6:13           ` [PATCH v4 3/6] Color skipped tests blue Jeff King
2012-11-11  2:04             ` Adam Spiers
2012-09-17 20:50 ` [PATCH] Make test output coloring more intuitive Junio C Hamano
2012-09-18 21:36   ` Adam Spiers
2012-09-18 21:59     ` Jeff King
2012-09-18 22:14       ` Adam Spiers
2012-09-19 17:15     ` [PATCH v2 0/6] make " Adam Spiers
2012-09-19 17:15       ` [PATCH v2 1/6] Change the color of individual known breakages Adam Spiers
2012-09-19 17:15       ` Adam Spiers [this message]
2012-09-19 17:50         ` [PATCH v2 2/6] Make 'not ok $count - $message' consistent with 'ok $count - $message' Jeff King
2012-09-19 23:39         ` Junio C Hamano
2012-09-19 23:45           ` Adam Spiers
2012-09-19 17:15       ` [PATCH v2 3/6] Color skipped tests the same as informational messages Adam Spiers
2012-09-19 17:15       ` [PATCH v2 4/6] Refactor mechanics of testing in a sub test-lib Adam Spiers
2012-09-19 17:56         ` Jeff King
2012-09-19 18:44           ` Adam Spiers
2012-09-19 18:49             ` [PATCH v3 " Adam Spiers
2012-09-19 18:49               ` [PATCH v3 5/6] Test the test framework more thoroughly Adam Spiers
2012-09-19 18:49               ` [PATCH v3 6/6] Treat unexpectedly fixed known breakages more seriously Adam Spiers
2012-09-20 21:13               ` [PATCH v3 4/6] Refactor mechanics of testing in a sub test-lib Junio C Hamano
2012-09-19 19:37             ` [PATCH v2 " Jeff King
2012-09-19 20:15               ` Adam Spiers
2012-09-19 17:15       ` [PATCH v2 5/6] Test the test framework more thoroughly Adam Spiers
2012-09-19 17:15       ` [PATCH v2 6/6] Treat unexpectedly fixed known breakages more seriously Adam Spiers
2012-09-19 18:05       ` [PATCH v2 0/6] make test output coloring more intuitive Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1348074915-19985-3-git-send-email-git@adamspiers.org \
    --to=git@adamspiers.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).