From: Brian Gernhardt <benji@silverinsanity.com>
Date: Wed, 4 Apr 2007 19:39:05 +0000 (-0400)
Subject: Fix t4200-rerere for white-space from "wc -l"
X-Git-Tag: v1.5.1.1~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=364b8523529163ffeeb71521239a18ac1f550512;p=git.git

Fix t4200-rerere for white-space from "wc -l"

On OS X, wc outputs 6 spaces before the number of lines, so the test
expecting the string "10" failed.  Do not quote $cmd to strip away
the problematic whitespace as other tests do.

Also fix the grammar of the test name while making changes to it.
There's only one preimage, so it's "has", not "have".

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 8b611bbea..bc878d750 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 = 10
 
 '