grep: prepare for testing binary regexes containing rx metacharacters

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>

Ævar Arnfjörð Bjarmason committed May 20, 2017 at 21:42 UTC 12fc32faa8b51d33f3793c45ea20ab02b9717574
1 file changed +3 -3
t/t7008-grep-binary.sh
+3 -3
@@ -28,7 +28,7 @@ nul_match () {
28 }
29
30 test_expect_success 'setup' "
31 - echo 'binaryQfile' | q_to_nul >a &&
31 + echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
32 git add a &&
33 git commit -m.
34 "
@@ -162,7 +162,7 @@ test_expect_success 'grep does not honor textconv' '
162 '
163
164 test_expect_success 'grep --textconv honors textconv' '
165 - echo "a:binaryQfile" >expect &&
165 + echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
166 git grep --textconv Qfile >actual &&
167 test_cmp expect actual
168 '
@@ -172,7 +172,7 @@ test_expect_success 'grep --no-textconv does not honor textconv' '
172 '
173
174 test_expect_success 'grep --textconv blob honors textconv' '
175 - echo "HEAD:a:binaryQfile" >expect &&
175 + echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
176 git grep --textconv Qfile HEAD:a >actual &&
177 test_cmp expect actual
178 '