From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 May 2012 18:14:57 +0000 (-0700)
Subject: Merge branch 'sl/test-wc-l-line-count' into maint
X-Git-Tag: v1.7.10.2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/538847cd4c6a7398e8799a829d731be75f09152f?hp=-c

Merge branch 'sl/test-wc-l-line-count' into maint

By Stefano Lattarini
* sl/test-wc-l-line-count:
tests: modernise style: more uses of test_line_count
---

538847cd4c6a7398e8799a829d731be75f09152f
diff --combined t/t9400-git-cvsserver-server.sh
index 173bf3d4af,d3e88f8dd6..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
  '
  
  #------------