mirror of
https://github.com/git/git.git
synced 2024-05-25 08:56:25 +02:00
72aae6d601
Amend a prerequisite check added in 5c1ebcca4d (grep/icase: avoid
kwsset on literal non-ascii strings, 2016-06-25) to do invoke
'test-tool regex' in such a way that we'll notice if it dies under
SANITIZE=leak due to having a memory leak, as opposed to us not having
the "ICASE" support we're checking for.
Because we weren't making a distinction between the two I'd marked
these tests as passing under SANITIZE=leak in 03d85e21951 (leak tests:
mark remaining leak-free tests as such, 2021-12-17).
Doing this is tricky. Ideally "test_lazy_prereq" would materialize as
a "real" test that we could check the exit code of with the same
signal matching that "test_must_fail" does.
However lazy prerequisites aren't real tests, and are instead lazily
materialized in the guts of "test_have_prereq" when we've already
started another test.
We could detect the abort() (or similar) there and pass that exit code
down, and fail the test that caused the prerequisites to be
materialized.
But that would require extensive changes to test-lib.sh and
test-lib-functions.sh. Let's instead simply check if the exit code of
"test-tool regex" is zero, and if so set the prerequisites. If it's
non-zero let's run it again with "test_must_fail". We'll thus make a
distinction between "bad" non-zero (segv etc) and "good" (exit 1 etc.).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
143 lines
4.5 KiB
Bash
Executable File
143 lines
4.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='grep icase on non-English locales'
|
|
|
|
. ./lib-gettext.sh
|
|
|
|
test_expect_success GETTEXT_LOCALE 'setup' '
|
|
test_write_lines "TILRAUN: Halló Heimur!" >file &&
|
|
git add file &&
|
|
LC_ALL="$is_IS_locale" &&
|
|
export LC_ALL
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE 'setup REGEX_LOCALE prerequisite' '
|
|
# This "test-tool" invocation is identical...
|
|
if test-tool regex "HALLÓ" "Halló" ICASE
|
|
then
|
|
test_set_prereq REGEX_LOCALE
|
|
else
|
|
|
|
# ... to this one, but this way "test_must_fail" will
|
|
# tell a segfault or abort() from the regexec() test
|
|
# itself
|
|
test_must_fail test-tool regex "HALLÓ" "Halló" ICASE
|
|
fi
|
|
'
|
|
|
|
test_expect_success REGEX_LOCALE 'grep literal string, no -F' '
|
|
git grep -i "TILRAUN: Halló Heimur!" &&
|
|
git grep -i "TILRAUN: HALLÓ HEIMUR!"
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 icase' '
|
|
git grep --perl-regexp "TILRAUN: H.lló Heimur!" &&
|
|
git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
|
|
git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 string with "+"' '
|
|
test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
|
|
git add file2 &&
|
|
git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
|
|
echo file >expected &&
|
|
echo file2 >>expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success REGEX_LOCALE 'grep literal string, with -F' '
|
|
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 "TILRAUN: Halló Heimur [abc]!" >file3 &&
|
|
git add file3 &&
|
|
git grep -i -F "TILRAUN: Halló Heimur [abc]!" file3
|
|
'
|
|
|
|
test_expect_success REGEX_LOCALE 'pickaxe -i on non-ascii' '
|
|
git commit -m first &&
|
|
git log --format=%f -i -S"TILRAUN: HALLÓ HEIMUR!" >actual &&
|
|
echo first >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: setup invalid UTF-8 data' '
|
|
printf "\\200\\n" >invalid-0x80 &&
|
|
echo "ævar" >expected &&
|
|
cat expected >>invalid-0x80 &&
|
|
git add invalid-0x80 &&
|
|
|
|
# Test for PCRE2_MATCH_INVALID_UTF bug
|
|
# https://bugs.exim.org/show_bug.cgi?id=2642
|
|
printf "\\345Aæ\\n" >invalid-0xe5 &&
|
|
git add invalid-0xe5
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data' '
|
|
git grep -h "var" invalid-0x80 >actual &&
|
|
test_cmp expected actual &&
|
|
git grep -h "(*NO_JIT)var" invalid-0x80 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)' '
|
|
git grep -h "Aæ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data' '
|
|
git grep -h "æ" invalid-0x80 >actual &&
|
|
test_cmp expected actual &&
|
|
git grep -h "(*NO_JIT)æ" invalid-0x80 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)' '
|
|
git grep -h "Aæ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual
|
|
'
|
|
|
|
test_lazy_prereq PCRE2_MATCH_INVALID_UTF '
|
|
test-tool pcre2-config has-PCRE2_MATCH_INVALID_UTF
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
|
|
test_might_fail git grep -hi "Æ" invalid-0x80 >actual &&
|
|
test_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2,PCRE2_MATCH_INVALID_UTF 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
|
|
git grep -hi "Æ" invalid-0x80 >actual &&
|
|
test_cmp expected actual &&
|
|
git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2,PCRE2_MATCH_INVALID_UTF 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)' '
|
|
git grep -hi "Æ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
git grep -hi "(*NO_JIT)Æ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
|
|
# Only the case of grepping the ASCII part in a way that
|
|
# relies on -i fails
|
|
git grep -hi "aÆ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
git grep -hi "(*NO_JIT)aÆ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-literal ASCII from UTF-8' '
|
|
git grep --perl-regexp -h -o -e ll. file >actual &&
|
|
echo "lló" >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|