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

diff --combined t/t9400-git-cvsserver-server.sh
index 173bf3d4afd7f6315c5ae887b98098a8815eaf16,d3e88f8dd6d0bf79cef3856a187006777881f1c7..806623e8858eef6ebe224ea14a38732f63fd6e49
--- 1/t/t9400-git-cvsserver-server.sh
--- 2/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
  '
  
  #------------