undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: prepare for testing binary regexes containing rx metacharacters

Browse Source 
Add setup code needed for testing regexes that contain both binary
data and regex metacharacters.

The POSIX regcomp() function inherently can't support that, because it
takes a \0-delimited char *, but other regex engines APIs like PCRE v2
take a pattern/length pair, and are thus able to handle \0s in
patterns as well as any other character.

When kwset was imported in commit 9eceddeec6 ("Use kwset in grep",
2011-08-21) this limitation was fixed, but at the expense of
introducing the undocumented limitation that any pattern containing \0
implicitly becomes a fixed match (equivalent to -F having been
provided).

That's not something we'd like to keep in the future. The inability to
match patterns containing \0 is a leaky implementation detail.

So add tests as a first step towards changing that. In order to test
that \0-patterns can properly match as regexes the test string needs
to have some regex metacharacters in it.

There were other blind spots in the tests. The code around kwset
specially handles case-insensitive & non-ASCII data, but there were no
tests for this.

Fix all of that by amending the text being matched to contain both
regex metacharacters & non-ASCII data.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2017-05-20 21:42:16 +00:00 committed by Junio C Hamano
parent 77f6f4406f
commit 12fc32faa8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t7008-grep-binary.sh
View File

@ -28,7 +28,7 @@ nul_match () {
} }
test_expect_success 'setup' " test_expect_success 'setup' "
echo 'binaryQfile' | q_to_nul >a && echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
git add a && git add a &&
git commit -m. git commit -m.
" "
@ -162,7 +162,7 @@ test_expect_success 'grep does not honor textconv' '
' '
test_expect_success 'grep --textconv honors textconv' ' test_expect_success 'grep --textconv honors textconv' '
echo "a:binaryQfile" >expect && echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
git grep --textconv Qfile >actual && git grep --textconv Qfile >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -172,7 +172,7 @@ test_expect_success 'grep --no-textconv does not honor textconv' '
' '
test_expect_success 'grep --textconv blob honors textconv' ' test_expect_success 'grep --textconv blob honors textconv' '
echo "HEAD:a:binaryQfile" >expect && echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
git grep --textconv Qfile HEAD:a >actual && git grep --textconv Qfile HEAD:a >actual &&
test_cmp expect actual test_cmp expect actual
' '