rpms/coreutils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Enable cut and sort-merge perl tests for multibyte as well

Browse Source
This commit is contained in:
Ondřej Vašík 2013-11-28 01:35:10 +01:00
parent 3e3be79dfd
commit cc8ce57be2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
coreutils-i18n.patch
View File

@ -4058,13 +4058,21 @@ diff -urNp coreutils-8.21-orig/tests/misc/cut.pl coreutils-8.21/tests/misc/cut.p
-my $mb_locale = $ENV{LOCALE_FR_UTF8}; -my $mb_locale = $ENV{LOCALE_FR_UTF8};
+my $mb_locale; +my $mb_locale;
+# uncommented enable multibyte paths +# uncommented enable multibyte paths
+#$mb_locale = $ENV{LOCALE_FR_UTF8}; +$mb_locale = $ENV{LOCALE_FR_UTF8};
! defined $mb_locale || $mb_locale eq 'none' ! defined $mb_locale || $mb_locale eq 'none'
- and $mb_locale = 'C'; - and $mb_locale = 'C';
+ and $mb_locale = 'C'; + and $mb_locale = 'C';
my $prog = 'cut'; my $prog = 'cut';
my $try = "Try '$prog --help' for more information.\n"; my $try = "Try '$prog --help' for more information.\n";
@@ -224,6 +226,7 @@
my @new_t = @$t;
my $test_name = shift @new_t;
+ next if ($test_name =~ "newline-[12][0-9]");
push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
}
push @Tests, @new;
diff -urNp coreutils-8.21-orig/tests/misc/expand.pl coreutils-8.21/tests/misc/expand.pl diff -urNp coreutils-8.21-orig/tests/misc/expand.pl coreutils-8.21/tests/misc/expand.pl
--- coreutils-8.21-orig/tests/misc/expand.pl 2013-01-31 01:46:24.000000000 +0100 --- coreutils-8.21-orig/tests/misc/expand.pl 2013-01-31 01:46:24.000000000 +0100
+++ coreutils-8.21/tests/misc/expand.pl 2013-11-27 19:47:58.431538769 +0100 +++ coreutils-8.21/tests/misc/expand.pl 2013-11-27 19:47:58.431538769 +0100
@ -4353,7 +4361,7 @@ diff -urNp coreutils-8.21-orig/tests/misc/sort-merge.pl coreutils-8.21/tests/mis
+my $mb_locale; +my $mb_locale;
+# uncommented according to upstream commit enabling multibyte paths +# uncommented according to upstream commit enabling multibyte paths
+#$mb_locale = $ENV{LOCALE_FR_UTF8}; +$mb_locale = $ENV{LOCALE_FR_UTF8};
+! defined $mb_locale || $mb_locale eq 'none' +! defined $mb_locale || $mb_locale eq 'none'
+ and $mb_locale = 'C'; + and $mb_locale = 'C';
+ +
@ -4392,7 +4400,7 @@ diff -urNp coreutils-8.21-orig/tests/misc/sort-merge.pl coreutils-8.21/tests/mis
+ push @new_t, $sub; + push @new_t, $sub;
+ push @$t, $sub; + push @$t, $sub;
+ } + }
+ next if ($test_name =~ "18g"); + next if ($test_name =~ "nmerge-.");
+ push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
+ } + }
+ push @Tests, @new; + push @Tests, @new;