From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2012 20:02:15 +0000 (-0700)
Subject: Merge branch 'bw/test-fix-grep-gnuism'
X-Git-Tag: v1.7.11-rc0~116
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e22a81ca54448fb49847ff72be0a8859bcc015ae?ds=inline;hp=-c

Merge branch 'bw/test-fix-grep-gnuism'

Fix two places that were the only place in the test suite that gave "a\+"
to platform grep and expected it to mean one or more "a", which is a
blatant GNUism.

* bw/test-fix-grep-gnuism:
t9400: fix gnuism in grep
---

e22a81ca54448fb49847ff72be0a8859bcc015ae
diff --combined t/t9400-git-cvsserver-server.sh
index d3e88f8dd6,173bf3d4af..806623e885
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@@ -476,14 -476,14 +476,14 @@@ test_expect_success 'cvs status' 
      cd cvswork &&
      GIT_CONFIG="$git_config" cvs update &&
      GIT_CONFIG="$git_config" cvs status | grep "^File: status.file" >../out &&
 -    test $(wc -l <../out) = 2
 +    test_line_count = 2 ../out
  '
  
  cd "$WORKDIR"
  test_expect_success 'cvs status (nonrecursive)' '
      cd cvswork &&
      GIT_CONFIG="$git_config" cvs status -l | grep "^File: status.file" >../out &&
 -    test $(wc -l <../out) = 1
 +    test_line_count = 1 ../out
  '
  
  cd "$WORKDIR"
@@@ -500,8 -500,8 +500,8 @@@ test_expect_success 'cvs status (no sub
  cd "$WORKDIR"
  test_expect_success 'cvs co -c (shows module database)' '
      GIT_CONFIG="$git_config" cvs co -c > out &&
-     grep "^master[	 ]\+master$" < out &&
-     ! grep -v "^master[	 ]\+master$" < out
+     grep "^master[	 ][ 	]*master$" <out &&
+     ! grep -v "^master[	 ][ 	]*master$" <out
  '
  
  #------------