mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
test-lib: rename the LIBPCRE prerequisite to PCRE
Rename the LIBPCRE prerequisite to PCRE. This is for preparation for libpcre2 support, where having just "LIBPCRE" would be confusing as it implies v1 of the library. None of these tests are incompatible between versions 1 & 2 of libpcre, it's less confusing to give them a more general name to make it clear that they work on both library versions. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d048cb13c2
commit
3eb585c112
4
t/README
4
t/README
|
@ -803,9 +803,9 @@ use these, and "test_set_prereq" for how to define your own.
|
|||
Test is not run by root user, and an attempt to write to an
|
||||
unwritable file is expected to fail correctly.
|
||||
|
||||
- LIBPCRE
|
||||
- PCRE
|
||||
|
||||
Git was compiled with USE_LIBPCRE=YesPlease. Wrap any tests
|
||||
Git was compiled with support for PCRE. Wrap any tests
|
||||
that use git-grep --perl-regexp or git-grep -P in these.
|
||||
|
||||
- CASE_INSENSITIVE_FS
|
||||
|
|
|
@ -275,7 +275,7 @@ do
|
|||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE "grep $L with grep.patterntype=perl" '
|
||||
test_expect_success PCRE "grep $L with grep.patterntype=perl" '
|
||||
echo "${HC}ab:a+b*c" >expected &&
|
||||
git -c grep.patterntype=perl grep "a\x{2b}b\x{2a}c" $H ab >actual &&
|
||||
test_cmp expected actual
|
||||
|
@ -1053,12 +1053,12 @@ hello.c:int main(int argc, const char **argv)
|
|||
hello.c: printf("Hello world.\n");
|
||||
EOF
|
||||
|
||||
test_expect_success LIBPCRE 'grep --perl-regexp pattern' '
|
||||
test_expect_success PCRE 'grep --perl-regexp pattern' '
|
||||
git grep --perl-regexp "\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -P pattern' '
|
||||
test_expect_success PCRE 'grep -P pattern' '
|
||||
git grep -P "\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
@ -1070,13 +1070,13 @@ test_expect_success 'grep pattern with grep.extendedRegexp=true' '
|
|||
test_cmp empty actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -P pattern with grep.extendedRegexp=true' '
|
||||
test_expect_success PCRE 'grep -P pattern with grep.extendedRegexp=true' '
|
||||
git -c grep.extendedregexp=true \
|
||||
grep -P "\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -P -v pattern' '
|
||||
test_expect_success PCRE 'grep -P -v pattern' '
|
||||
{
|
||||
echo "ab:a+b*c"
|
||||
echo "ab:a+bc"
|
||||
|
@ -1085,7 +1085,7 @@ test_expect_success LIBPCRE 'grep -P -v pattern' '
|
|||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -P -i pattern' '
|
||||
test_expect_success PCRE 'grep -P -i pattern' '
|
||||
cat >expected <<-EOF &&
|
||||
hello.c: printf("Hello world.\n");
|
||||
EOF
|
||||
|
@ -1093,7 +1093,7 @@ test_expect_success LIBPCRE 'grep -P -i pattern' '
|
|||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -P -w pattern' '
|
||||
test_expect_success PCRE 'grep -P -w pattern' '
|
||||
{
|
||||
echo "hello_world:Hello world"
|
||||
echo "hello_world:HeLLo world"
|
||||
|
@ -1118,11 +1118,11 @@ test_expect_success 'grep invalidpattern properly dies with grep.patternType=ext
|
|||
test_must_fail git -c grep.patterntype=extended grep "a["
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -P invalidpattern properly dies ' '
|
||||
test_expect_success PCRE 'grep -P invalidpattern properly dies ' '
|
||||
test_must_fail git grep -P "a["
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep invalidpattern properly dies with grep.patternType=perl' '
|
||||
test_expect_success PCRE 'grep invalidpattern properly dies with grep.patternType=perl' '
|
||||
test_must_fail git -c grep.patterntype=perl grep "a["
|
||||
'
|
||||
|
||||
|
@ -1191,13 +1191,13 @@ test_expect_success 'grep pattern with grep.patternType=fixed, =basic, =perl, =e
|
|||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -G -F -E -P pattern' '
|
||||
test_expect_success PCRE 'grep -G -F -E -P pattern' '
|
||||
echo "d0:0" >expected &&
|
||||
git grep -G -F -E -P "[\d]" d0 >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep pattern with grep.patternType=fixed, =basic, =extended, =perl' '
|
||||
test_expect_success PCRE 'grep pattern with grep.patternType=fixed, =basic, =extended, =perl' '
|
||||
echo "d0:0" >expected &&
|
||||
git \
|
||||
-c grep.patterntype=fixed \
|
||||
|
@ -1208,7 +1208,7 @@ test_expect_success LIBPCRE 'grep pattern with grep.patternType=fixed, =basic, =
|
|||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -P pattern with grep.patternType=fixed' '
|
||||
test_expect_success PCRE 'grep -P pattern with grep.patternType=fixed' '
|
||||
echo "ab:a+b*c" >expected &&
|
||||
git \
|
||||
-c grep.patterntype=fixed \
|
||||
|
@ -1343,12 +1343,12 @@ space: line with leading space2
|
|||
space: line with leading space3
|
||||
EOF
|
||||
|
||||
test_expect_success LIBPCRE 'grep -E "^ "' '
|
||||
test_expect_success PCRE 'grep -E "^ "' '
|
||||
git grep -E "^ " space >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -P "^ "' '
|
||||
test_expect_success PCRE 'grep -P "^ "' '
|
||||
git grep -P "^ " space >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
|
|
@ -20,13 +20,13 @@ test_expect_success REGEX_LOCALE 'grep literal string, no -F' '
|
|||
git grep -i "TILRAUN: HALLÓ HEIMUR!"
|
||||
'
|
||||
|
||||
test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 icase' '
|
||||
test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 icase' '
|
||||
git grep --perl-regexp "TILRAUN: H.lló Heimur!" &&
|
||||
git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
|
||||
git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
|
||||
'
|
||||
|
||||
test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 string with "+"' '
|
||||
test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 string with "+"' '
|
||||
test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
|
||||
git add file2 &&
|
||||
git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
|
||||
|
|
|
@ -11,7 +11,7 @@ test_expect_success GETTEXT_ISO_LOCALE 'setup' '
|
|||
export LC_ALL
|
||||
'
|
||||
|
||||
test_expect_success GETTEXT_ISO_LOCALE,LIBPCRE 'grep pcre string' '
|
||||
test_expect_success GETTEXT_ISO_LOCALE,PCRE 'grep pcre string' '
|
||||
git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
|
||||
git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
|
||||
'
|
||||
|
|
|
@ -1010,7 +1010,7 @@ esac
|
|||
( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
|
||||
test -z "$NO_PERL" && test_set_prereq PERL
|
||||
test -z "$NO_PYTHON" && test_set_prereq PYTHON
|
||||
test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
|
||||
test -n "$USE_LIBPCRE" && test_set_prereq PCRE
|
||||
test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
|
||||
|
||||
# Can we rely on git's output in the C locale?
|
||||
|
|
Loading…
Reference in a new issue