t7810: add missing variables to tests in loop

Some tests in t7810-grep.sh are in a loop that runs them against HEAD and
the work tree.  In order for that to work the test code should use the
variables $L (display name), $H (HEAD or empty string) and $HC (revision
prefix for result lines); otherwise tests are just repeated with the same
target.  Add the variables where they're missing and make sure the test
description is wrapped in double quotes (instead of single quotes) to
allow variables to be expanded.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2014-03-11 22:07:58 +01:00 committed by Junio C Hamano
parent 5f95c9f850
commit 9afad7a1e6

View File

@ -105,7 +105,7 @@ do
test_expect_success "grep -w $L (w)" ' test_expect_success "grep -w $L (w)" '
: >expected && : >expected &&
test_must_fail git grep -n -w -e "^w" >actual && test_must_fail git grep -n -w -e "^w" $H >actual &&
test_cmp expected actual test_cmp expected actual
' '
@ -240,92 +240,92 @@ do
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep $L with grep.extendedRegexp=false" ' test_expect_success "grep $L with grep.extendedRegexp=false" '
echo "ab:a+bc" >expected && echo "${HC}ab:a+bc" >expected &&
git -c grep.extendedRegexp=false grep "a+b*c" ab >actual && git -c grep.extendedRegexp=false grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep $L with grep.extendedRegexp=true" ' test_expect_success "grep $L with grep.extendedRegexp=true" '
echo "ab:abc" >expected && echo "${HC}ab:abc" >expected &&
git -c grep.extendedRegexp=true grep "a+b*c" ab >actual && git -c grep.extendedRegexp=true grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep $L with grep.patterntype=basic" ' test_expect_success "grep $L with grep.patterntype=basic" '
echo "ab:a+bc" >expected && echo "${HC}ab:a+bc" >expected &&
git -c grep.patterntype=basic grep "a+b*c" ab >actual && git -c grep.patterntype=basic grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep $L with grep.patterntype=extended" ' test_expect_success "grep $L with grep.patterntype=extended" '
echo "ab:abc" >expected && echo "${HC}ab:abc" >expected &&
git -c grep.patterntype=extended grep "a+b*c" ab >actual && git -c grep.patterntype=extended grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep $L with grep.patterntype=fixed" ' test_expect_success "grep $L with grep.patterntype=fixed" '
echo "ab:a+b*c" >expected && echo "${HC}ab:a+b*c" >expected &&
git -c grep.patterntype=fixed grep "a+b*c" ab >actual && git -c grep.patterntype=fixed grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success LIBPCRE "grep $L with grep.patterntype=perl" ' test_expect_success LIBPCRE "grep $L with grep.patterntype=perl" '
echo "ab:a+b*c" >expected && echo "${HC}ab:a+b*c" >expected &&
git -c grep.patterntype=perl grep "a\x{2b}b\x{2a}c" ab >actual && git -c grep.patterntype=perl grep "a\x{2b}b\x{2a}c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep $L with grep.patternType=default and grep.extendedRegexp=true" ' test_expect_success "grep $L with grep.patternType=default and grep.extendedRegexp=true" '
echo "ab:abc" >expected && echo "${HC}ab:abc" >expected &&
git \ git \
-c grep.patternType=default \ -c grep.patternType=default \
-c grep.extendedRegexp=true \ -c grep.extendedRegexp=true \
grep "a+b*c" ab >actual && grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep $L with grep.extendedRegexp=true and grep.patternType=default" ' test_expect_success "grep $L with grep.extendedRegexp=true and grep.patternType=default" '
echo "ab:abc" >expected && echo "${HC}ab:abc" >expected &&
git \ git \
-c grep.extendedRegexp=true \ -c grep.extendedRegexp=true \
-c grep.patternType=default \ -c grep.patternType=default \
grep "a+b*c" ab >actual && grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'grep $L with grep.patternType=extended and grep.extendedRegexp=false' ' test_expect_success "grep $L with grep.patternType=extended and grep.extendedRegexp=false" '
echo "ab:abc" >expected && echo "${HC}ab:abc" >expected &&
git \ git \
-c grep.patternType=extended \ -c grep.patternType=extended \
-c grep.extendedRegexp=false \ -c grep.extendedRegexp=false \
grep "a+b*c" ab >actual && grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'grep $L with grep.patternType=basic and grep.extendedRegexp=true' ' test_expect_success "grep $L with grep.patternType=basic and grep.extendedRegexp=true" '
echo "ab:a+bc" >expected && echo "${HC}ab:a+bc" >expected &&
git \ git \
-c grep.patternType=basic \ -c grep.patternType=basic \
-c grep.extendedRegexp=true \ -c grep.extendedRegexp=true \
grep "a+b*c" ab >actual && grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'grep $L with grep.extendedRegexp=false and grep.patternType=extended' ' test_expect_success "grep $L with grep.extendedRegexp=false and grep.patternType=extended" '
echo "ab:abc" >expected && echo "${HC}ab:abc" >expected &&
git \ git \
-c grep.extendedRegexp=false \ -c grep.extendedRegexp=false \
-c grep.patternType=extended \ -c grep.patternType=extended \
grep "a+b*c" ab >actual && grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'grep $L with grep.extendedRegexp=true and grep.patternType=basic' ' test_expect_success "grep $L with grep.extendedRegexp=true and grep.patternType=basic" '
echo "ab:a+bc" >expected && echo "${HC}ab:a+bc" >expected &&
git \ git \
-c grep.extendedRegexp=true \ -c grep.extendedRegexp=true \
-c grep.patternType=basic \ -c grep.patternType=basic \
grep "a+b*c" ab >actual && grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
done done