diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:43 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:43 -0800 |
commit | dac30e7b5dd6319039328b868a99e0732afab4ff (patch) | |
tree | a5ed7b1c3444e4104cd40922c0c86f2c1b5b5dfe | |
parent | Merge branch 'dl/pretty-reference' (diff) | |
parent | t7812: expect failure for grep -i with invalid UTF-8 data (diff) | |
download | tgif-dac30e7b5dd6319039328b868a99e0732afab4ff.tar.xz |
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
-rwxr-xr-x | t/t7812-grep-icase-non-ascii.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh index 531eb59d57..03dba6685a 100755 --- a/t/t7812-grep-icase-non-ascii.sh +++ b/t/t7812-grep-icase-non-ascii.sh @@ -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' ' git grep -h "æ" invalid-0x80 >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_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_cmp expected actual && - test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 && - test_cmp expected actual + if test -s actual + then + test_cmp expected actual + fi && + test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual && + ! test_cmp expected actual ' test_done |