development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: grep portability fixes

Browse source 
We try to avoid using the "-q" or "-e" options, as they are
largely useless, as explained in aadbe44f.

There is one exception for "-e" here, which is in t7701 used
to produce an "or" of patterns. This can be rewritten as an
egrep pattern.

This patch also removes use of "grep -F" in favor of the
more widely available "fgrep".

[sp: Tested on AIX 5.3 by Mike Ralphson,
     Tested on MinGW by Johannes Sixt]

Signed-off-by: Jeff King <peff@peff.net>
Tested-by: Mike Ralphson <mike@abacus.co.uk>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Jeff King 2008-09-30 04:03:55 -04:00 committed by Shawn O. Pearce
parent c33912ae24
commit 87539416fd
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
t/t0002-gitfile.sh
View file

@ -32,7 +32,7 @@ test_expect_success 'bad setup: invalid .git file format' '
echo "git rev-parse accepted an invalid .git file" echo "git rev-parse accepted an invalid .git file"
false false
fi && fi &&
if ! grep -qe "Invalid gitfile format" .err if ! grep "Invalid gitfile format" .err
then then
echo "git rev-parse returned wrong error" echo "git rev-parse returned wrong error"
false false
@ -46,7 +46,7 @@ test_expect_success 'bad setup: invalid .git file path' '
echo "git rev-parse accepted an invalid .git file path" echo "git rev-parse accepted an invalid .git file path"
false false
fi && fi &&
if ! grep -qe "Not a git repository" .err if ! grep "Not a git repository" .err
then then
echo "git rev-parse returned wrong error" echo "git rev-parse returned wrong error"
false false

2
t/t1501-worktree.sh
View file

@ -171,7 +171,7 @@ test_expect_success 'git diff' '
test_expect_success 'git grep' ' test_expect_success 'git grep' '
(cd repo.git/work/sub && (cd repo.git/work/sub &&
GIT_DIR=../.. GIT_WORK_TREE=.. git grep -l changed | grep -q dir/tracked) GIT_DIR=../.. GIT_WORK_TREE=.. git grep -l changed | grep dir/tracked)
' '
test_done test_done

2
t/t3700-add.sh
View file

@ -226,7 +226,7 @@ test_expect_success 'git add '\''fo\[ou\]bar'\'' ignores foobar' '
git reset --hard && git reset --hard &&
touch fo\[ou\]bar foobar && touch fo\[ou\]bar foobar &&
git add '\''fo\[ou\]bar'\'' && git add '\''fo\[ou\]bar'\'' &&
git ls-files fo\[ou\]bar | grep -F fo\[ou\]bar && git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
! ( git ls-files foobar | grep foobar ) ! ( git ls-files foobar | grep foobar )
' '

2
t/t4150-am.sh
View file

@ -165,7 +165,7 @@ test_expect_success 'am --keep really keeps the subject' '
git am --keep patch4 && git am --keep patch4 &&
! test -d .git/rebase-apply && ! test -d .git/rebase-apply &&
git cat-file commit HEAD | git cat-file commit HEAD |
grep -q -F "Re: Re: Re: [PATCH 1/5 v2] third" fgrep "Re: Re: Re: [PATCH 1/5 v2] third"
' '
test_expect_success 'am -3 falls back to 3-way merge' ' test_expect_success 'am -3 falls back to 3-way merge' '

4
t/t6040-tracking-info.sh
View file

@ -53,7 +53,7 @@ test_expect_success 'checkout' '
( (
cd test && git checkout b1 cd test && git checkout b1
) >actual && ) >actual &&
grep -e "have 1 and 1 different" actual grep "have 1 and 1 different" actual
' '
test_expect_success 'status' ' test_expect_success 'status' '
@ -63,7 +63,7 @@ test_expect_success 'status' '
# reports nothing to commit # reports nothing to commit
test_must_fail git status test_must_fail git status
) >actual && ) >actual &&
grep -e "have 1 and 1 different" actual grep "have 1 and 1 different" actual
' '

2
t/t7002-grep.sh
View file

@ -109,7 +109,7 @@ do
' '
test_expect_success "grep -c $L (no /dev/null)" ' test_expect_success "grep -c $L (no /dev/null)" '
! git grep -c test $H | grep -q /dev/null ! git grep -c test $H | grep /dev/null
' '
done done

4
t/t7701-repack-unpack-unreachable.sh
View file

@ -29,7 +29,7 @@ test_expect_success '-A option leaves unreachable objects unpacked' '
git repack -A -d -l && git repack -A -d -l &&
# verify objects are packed in repository # verify objects are packed in repository
test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx | test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx |
grep -e "^$fsha1 " -e "^$csha1 " -e "^$tsha1 " | egrep "^($fsha1|$csha1|$tsha1) " |
sort | uniq | wc -l) && sort | uniq | wc -l) &&
git show $fsha1 && git show $fsha1 &&
git show $csha1 && git show $csha1 &&
@ -41,7 +41,7 @@ test_expect_success '-A option leaves unreachable objects unpacked' '
git repack -A -d -l && git repack -A -d -l &&
# verify objects are retained unpacked # verify objects are retained unpacked
test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx | test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
grep -e "^$fsha1 " -e "^$csha1 " -e "^$tsha1 " | egrep "^($fsha1|$csha1|$tsha1) " |
sort | uniq | wc -l) && sort | uniq | wc -l) &&
git show $fsha1 && git show $fsha1 &&
git show $csha1 && git show $csha1 &&

2
t/t9500-gitweb-standalone-no-errors.sh
View file

@ -56,7 +56,7 @@ gitweb_run () {
rm -f gitweb.log && rm -f gitweb.log &&
perl -- "$TEST_DIRECTORY/../gitweb/gitweb.perl" \ perl -- "$TEST_DIRECTORY/../gitweb/gitweb.perl" \
>/dev/null 2>gitweb.log && >/dev/null 2>gitweb.log &&
if grep -q -s "^[[]" gitweb.log >/dev/null; then false; else true; fi if grep "^[[]" gitweb.log >/dev/null 2>&1; then false; else true; fi
# gitweb.log is left for debugging # gitweb.log is left for debugging
} }