Skip to content

Commit b14cf11

Browse files
avargitster
authored andcommitted
t4210: skip more command-line encoding tests on MinGW
In 5212f91 ("t4210: skip command-line encoding tests on mingw", 2014-07-17) the positive tests in this file were skipped. That left the negative tests that don't produce a match. An upcoming change to migrate the "fixed" backend of grep to PCRE v2 will cause these "log" commands to produce an error instead on MinGW. This is because the command-line on that platform implicitly has its encoding changed before being passed to git. See [1]. 1. https://public-inbox.org/git/[email protected]/ Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4457018 commit b14cf11

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

t/t4210-log-i18n.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ test_expect_success !MINGW 'log --grep does not find non-reencoded values (utf8)
5151
test_must_be_empty actual
5252
'
5353

54-
test_expect_success 'log --grep does not find non-reencoded values (latin1)' '
54+
test_expect_success !MINGW 'log --grep does not find non-reencoded values (latin1)' '
5555
git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
5656
test_must_be_empty actual
5757
'
@@ -70,7 +70,7 @@ do
7070
then
7171
force_regex=.*
7272
fi
73-
test_expect_success GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
73+
test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
7474
cat >expect <<-\EOF &&
7575
latin1
7676
utf8
@@ -79,12 +79,12 @@ do
7979
test_cmp expect actual
8080
"
8181

82-
test_expect_success GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
82+
test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
8383
LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$utf8_e\" >actual &&
8484
test_must_be_empty actual
8585
"
8686

87-
test_expect_success GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)" "
87+
test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)" "
8888
LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$invalid_e\" >actual &&
8989
test_must_be_empty actual
9090
"

0 commit comments

Comments
 (0)