On 05/11, Ævar Arnfjörð Bjarmason wrote:
> 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 <ava...@gmail.com>
> ---
> t/t7812-grep-icase-non-ascii.sh | 25 +++++--------------------
> 1 file changed, 5 insertions(+), 20 deletions(-)
>
> diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
> index 04a61cb8e0..969e7c0dda 100755
> --- a/t/t7812-grep-icase-non-ascii.sh
> +++ b/t/t7812-grep-icase-non-ascii.sh
> @@ -36,29 +36,14 @@ test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8
> string with "+"' '
> '
>
> test_expect_success REGEX_LOCALE 'grep literal string, with -F' '
> - git grep --debug -i -F "TILRAUN: Halló Heimur!" 2>&1 >/dev/null |
> - grep fixed >debug1 &&
> - test_write_lines "fixed TILRAUN: Halló Heimur!" >expect1 &&
> - test_cmp expect1 debug1 &&
> -
> - git grep --debug -i -F "TILRAUN: HALLÓ HEIMUR!" 2>&1 >/dev/null |
> - grep fixed >debug2 &&
> - test_write_lines "fixed TILRAUN: HALLÓ HEIMUR!" >expect2 &&
> - test_cmp expect2 debug2
> + git grep -i -F "TILRAUN: Halló Heimur!" &&
> + git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
> '
>
> test_expect_success REGEX_LOCALE 'grep string with regex, with -F' '
> - test_write_lines "^*TILR^AUN:.* \\Halló \$He[]imur!\$" >file &&
> -
> - git grep --debug -i -F "^*TILR^AUN:.* \\Halló \$He[]imur!\$" 2>&1
> >/dev/null |
> - grep fixed >debug1 &&
> - test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\Halló
> \$He\\[]imur!\\\$" >expect1 &&
> - test_cmp expect1 debug1 &&
> -
> - git grep --debug -i -F "^*TILR^AUN:.* \\HALLÓ \$HE[]IMUR!\$" 2>&1
> >/dev/null |
> - grep fixed >debug2 &&
> - test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\HALLÓ
> \$HE\\[]IMUR!\\\$" >expect2 &&
> - test_cmp expect2 debug2
> + test_write_lines "TILRAUN: Halló Heimur [abc]!" >file3 &&
> + git add file3 &&
> + git grep --debug -i -F "TILRAUN: Halló Heimur [abc]!" file3
> '
Your commit message leads me to believe that you are reformatting the
tests such that you don't use the '--dubug' flag yet this last line uses
it. Is this intentional?
--
Brandon Williams
