diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch index da1f938..2d04311 100644 --- a/coreutils-i18n.patch +++ b/coreutils-i18n.patch @@ -4476,6 +4476,14 @@ Index: tests/misc/sort.pl @Tests = triple_test \@Tests; # Remember that triple_test creates from each test with exactly one "IN" +@@ -424,6 +460,7 @@ foreach my $t (@Tests) + # Remove the IN_PIPE version of the "output-is-input" test above. + # The others aren't susceptible because they have three inputs each. + @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; ++@Tests = grep {$_->[0] ne 'output-is-input-mb.p'} @Tests; + + my $save_temps = $ENV{DEBUG}; + my $verbose = $ENV{VERBOSE}; Index: tests/misc/unexpand.pl =================================================================== --- tests/misc/unexpand.pl.orig diff --git a/coreutils-testsuite.changes b/coreutils-testsuite.changes index e3a4b01..bbed790 100644 --- a/coreutils-testsuite.changes +++ b/coreutils-testsuite.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 11 20:22:47 UTC 2013 - mail@bernhard-voelker.de + +- Avoid false sort test failure (coreutils-i18n.patch): + As for the C locale, skip the multi-byte test case + 'output-is-input-mb.p'. + ------------------------------------------------------------------- Sat Dec 7 19:15:40 UTC 2013 - schwab@linux-m68k.org diff --git a/coreutils.changes b/coreutils.changes index e3a4b01..bbed790 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 11 20:22:47 UTC 2013 - mail@bernhard-voelker.de + +- Avoid false sort test failure (coreutils-i18n.patch): + As for the C locale, skip the multi-byte test case + 'output-is-input-mb.p'. + ------------------------------------------------------------------- Sat Dec 7 19:15:40 UTC 2013 - schwab@linux-m68k.org