Merge branch 'as/t7812-missing-redirects-fix'

Test fix.

* as/t7812-missing-redirects-fix:
  t7812: expect failure for grep -i with invalid UTF-8 data
  t7812: add missing redirects
maint
Junio C Hamano 2019-12-10 13:11:43 -08:00
commit dac30e7b5d
1 changed files with 7 additions and 4 deletions

View File

@ -70,15 +70,18 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UT
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data' ' test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data' '
git grep -h "æ" invalid-0x80 >actual && git grep -h "æ" invalid-0x80 >actual &&
test_cmp expected actual && test_cmp expected actual &&
git grep -h "(*NO_JIT)æ" invalid-0x80 && git grep -h "(*NO_JIT)æ" invalid-0x80 >actual &&
test_cmp expected actual test_cmp expected actual
' '


test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' ' 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 "Æ" invalid-0x80 >actual &&
test_cmp expected actual && if test -s actual
test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 && then
test_cmp expected actual test_cmp expected actual
fi &&
test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
! test_cmp expected actual
' '


test_done test_done