git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Fix t4200-rerere for white-space from "wc -l"
@ 2007-04-04 19:39 Brian Gernhardt
  0 siblings, 0 replies; only message in thread
From: Brian Gernhardt @ 2007-04-04 19:39 UTC (permalink / raw)
  To: git

On OS X, wc outputs 6 spaces before the number of lines, so the test
expecting the string "10" failed.  Changing the test to use -eq for
numerical equality ignores the problematic whitespace.

Also fix the grammar of the test name while making changes to it.
There's only one preimage, so it's "has", not "have".
---
 t/t4200-rerere.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 8b611bb..cd939ac 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -50,10 +50,10 @@ test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
 test_expect_success 'no postimage or thisimage yet' \
 	"test ! -f $rr/postimage -a ! -f $rr/thisimage"
 
-test_expect_success 'preimage have right number of lines' '
+test_expect_success 'preimage has right number of lines' '
 
 	cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
-	test "$cnt" = 10
+	test "$cnt" -eq 10
 
 '
 
-- 
1.5.1.rc3.30.ga8f4

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2007-04-04 19:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-04 19:39 [PATCH] Fix t4200-rerere for white-space from "wc -l" Brian Gernhardt

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).