grep: change non-ASCII -i test to stop using --debug
Change a non-ASCII case-insensitive test case to stop using --debug, and instead simply test for the expected results. The test coverage remains the same with this change, but the test won't break due to internal refactoring. This test was added in commit 793dc676e0 ("grep/icase: avoid kwsset when -F is specified", 2016-06-25). It was asserting that the regex must be compiled with compile_fixed_regexp(), instead test for the expected results, allowing the underlying implementation to change. 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
e01b4dab01e4d0c8ae57647279c1075ec56d2b58
1 file changed
+5
-20
t/t7812-grep-icase-non-ascii.sh
+5
-20
@@ -36,29 +36,14 @@ test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 string with "+"' '
36
'
37
38
test_expect_success REGEX_LOCALE 'grep literal string, with -F' '
39
- git grep --debug -i -F "TILRAUN: Halló Heimur!" 2>&1 >/dev/null |
40
- grep fixed >debug1 &&
41
- test_write_lines "fixed TILRAUN: Halló Heimur!" >expect1 &&
42
- test_cmp expect1 debug1 &&
43
-
44
- git grep --debug -i -F "TILRAUN: HALLÓ HEIMUR!" 2>&1 >/dev/null |
45
- grep fixed >debug2 &&
46
- test_write_lines "fixed TILRAUN: HALLÓ HEIMUR!" >expect2 &&
47
- test_cmp expect2 debug2
39
+ git grep -i -F "TILRAUN: Halló Heimur!" &&
40
+ git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
41
'
42
43
test_expect_success REGEX_LOCALE 'grep string with regex, with -F' '
51
- test_write_lines "^*TILR^AUN:.* \\Halló \$He[]imur!\$" >file &&
52
-
53
- git grep --debug -i -F "^*TILR^AUN:.* \\Halló \$He[]imur!\$" 2>&1 >/dev/null |
54
- grep fixed >debug1 &&
55
- test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\Halló \$He\\[]imur!\\\$" >expect1 &&
56
- test_cmp expect1 debug1 &&
57
-
58
- git grep --debug -i -F "^*TILR^AUN:.* \\HALLÓ \$HE[]IMUR!\$" 2>&1 >/dev/null |
59
- grep fixed >debug2 &&
60
- test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\HALLÓ \$HE\\[]IMUR!\\\$" >expect2 &&
61
- test_cmp expect2 debug2
44
+ test_write_lines "TILRAUN: Halló Heimur [abc]!" >file3 &&
45
+ git add file3 &&
46
+ git grep -i -F "TILRAUN: Halló Heimur [abc]!" file3
47
'
48
49
test_expect_success REGEX_LOCALE 'pickaxe -i on non-ascii' '