Skip to content

Commit a4fea08

Browse files
avargitster
authored andcommitted
grep/pcre2 tests: don't rely on invalid UTF-8 data test
As noted in [1] when I originally added this test in [2] the test was completely broken as it lacked a redirect[3]. I now think this whole thing is overly fragile. Let's only test if we have a segfault here. Before this the first test's "test_cmp" was pretty meaningless. We were only testing if PCREv2 was so broken that it would spew out something completely unrelated on stdout, which isn't very plausible. In the second test we're relying on PCREv2 forever holding to the current behavior of the PCRE_UTF8 flag, as opposed to learning some optimistic graceful fallback to PCRE2_MATCH_INVALID_UTF in the future. If that happens having this test broken under bisecting would suck. A follow-up commit will actually test this case in a meaningful way under the PCRE2_MATCH_INVALID_UTF flag. Let's run this one unconditionally, and just make sure we don't segfault. 1. e714b89 (t7812: expect failure for grep -i with invalid UTF-8 data, 2019-11-29) 2. 8a59998 (grep: stess test PCRE v2 on invalid UTF-8 data, 2019-07-26) 3. c74b3cb (t7812: add missing redirects, 2019-11-26) Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 66e871b commit a4fea08

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

t/t7812-grep-icase-non-ascii.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,7 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invali
7676

7777
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
7878
test_might_fail git grep -hi "Æ" invalid-0x80 >actual &&
79-
if test -s actual
80-
then
81-
test_cmp expected actual
82-
fi &&
83-
test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
84-
! test_cmp expected actual
79+
test_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual
8580
'
8681

8782
test_done

0 commit comments

Comments
 (0)