forked from pool/coreutils
* sort-keycompare-mb.patch: Add information about the origin of the
patch (in sort.c and the test). Add a comment why to skip the 11a and 11b tests. Refresh with -p0. * coreutils-fix_false_du_failure_on_newer_xfs.patch: Refresh with -p0. * coreutils.spec: Remove -p1 patch option for the above 2 patches. * coreutils-testsuite.spec: Likewise. * coreutils-disable_tests.patch: Refresh to avoid fuzz. * coreutils-test_without_valgrind.patch: Refresh. OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=242
This commit is contained in:
Bernhard Voelker
Git OBS Bridge
parent
2311282852
commit
29e6b9981e
@ -4,9 +4,9 @@
|
||||
|
||||
Index: gnulib-tests/gnulib.mk
|
||||
===================================================================
|
||||
--- gnulib-tests/gnulib.mk.orig 2014-09-18 18:39:37.692580154 +0200
|
||||
+++ gnulib-tests/gnulib.mk 2014-09-18 18:40:13.905127435 +0200
|
||||
@@ -877,11 +877,11 @@ EXTRA_DIST += test-getloadavg.c signatur
|
||||
--- gnulib-tests/gnulib.mk.orig
|
||||
+++ gnulib-tests/gnulib.mk
|
||||
@@ -883,11 +883,11 @@ EXTRA_DIST += test-getloadavg.c signatur
|
||||
## end gnulib module getloadavg-tests
|
||||
|
||||
## begin gnulib module getlogin-tests
|
||||
|
||||
@ -94,11 +94,11 @@ sufficient nowadays.
|
||||
tests/du/2g.sh | 17 ++++++++---------
|
||||
1 file changed, 8 insertions(+), 9 deletions(-)
|
||||
|
||||
Index: coreutils-8.22/tests/du/2g.sh
|
||||
Index: tests/du/2g.sh
|
||||
===================================================================
|
||||
--- coreutils-8.22.orig/tests/du/2g.sh 2013-12-04 15:48:30.000000000 +0100
|
||||
+++ coreutils-8.22/tests/du/2g.sh 2014-09-16 14:00:30.718944253 +0200
|
||||
@@ -46,15 +46,14 @@ test $min_kb -lt $free_kb ||
|
||||
--- tests/du/2g.sh.orig
|
||||
+++ tests/du/2g.sh
|
||||
@@ -43,15 +43,14 @@ test $min_kb -lt $free_kb ||
|
||||
|
||||
big=big
|
||||
rm -f $big
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
Index: tests/misc/shuf-reservoir.sh
|
||||
===================================================================
|
||||
--- tests/misc/shuf-reservoir.sh.orig 2013-12-09 14:40:46.000000000 +0100
|
||||
+++ tests/misc/shuf-reservoir.sh 2014-09-18 18:30:07.752705383 +0200
|
||||
--- tests/misc/shuf-reservoir.sh.orig
|
||||
+++ tests/misc/shuf-reservoir.sh
|
||||
@@ -37,8 +37,7 @@ run_shuf_n()
|
||||
|
||||
# Critical memory-related bugs will cause a segfault here
|
||||
|
||||
@ -151,7 +151,7 @@ the GNU fileutils, sh-utils, and textutils packages.
|
||||
%prep
|
||||
%setup -q -n coreutils-%{version}
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
%patch5
|
||||
%patch1
|
||||
%patch3
|
||||
%patch8
|
||||
@ -171,7 +171,7 @@ the GNU fileutils, sh-utils, and textutils packages.
|
||||
%patch303
|
||||
%patch400
|
||||
%patch401
|
||||
%patch416 -p1
|
||||
%patch416
|
||||
%patch500
|
||||
%patch501
|
||||
|
||||
|
||||
@ -151,7 +151,7 @@ the GNU fileutils, sh-utils, and textutils packages.
|
||||
%prep
|
||||
%setup -q -n coreutils-%{version}
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
%patch5
|
||||
%patch1
|
||||
%patch3
|
||||
%patch8
|
||||
@ -171,7 +171,7 @@ the GNU fileutils, sh-utils, and textutils packages.
|
||||
%patch303
|
||||
%patch400
|
||||
%patch401
|
||||
%patch416 -p1
|
||||
%patch416
|
||||
%patch500
|
||||
%patch501
|
||||
|
||||
|
||||
@ -1,7 +1,27 @@
|
||||
Index: coreutils-8.23/src/sort.c
|
||||
Subject: sort i18n: make sure to NUL-terminate the sort keys
|
||||
|
||||
Fixes http://bugs.gnu.org/18540
|
||||
|
||||
* src/sort.c (keycompare_mb): use the keys alone, i.e. null-terminated.
|
||||
Patch analogously to non-multibyte upstream patch:
|
||||
http://git.sv.gnu.org/cgit/coreutils.git/commit/?id=b877ea4b3e
|
||||
|
||||
* tests/misc/sort.pl (23): Add test, taken from upstream patch:
|
||||
http://git.sv.gnu.org/cgit/coreutils.git/commit/?id=4d8c4dfc21
|
||||
(11a): Exempt from MB run, as the collation order in the French
|
||||
locale would provoke a false positive, because the strcoll() comparison
|
||||
between the trailing blank and tabs leads to a different result there.
|
||||
(11b): Likewise.
|
||||
|
||||
---
|
||||
src/sort.c | 22 ++++++++++++++++++++--
|
||||
tests/misc/sort.pl | 5 +++++
|
||||
2 files changed, 25 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: src/sort.c
|
||||
===================================================================
|
||||
--- coreutils-8.23.orig/src/sort.c
|
||||
+++ coreutils-8.23/src/sort.c
|
||||
--- src/sort.c.orig
|
||||
+++ src/sort.c
|
||||
@@ -3236,6 +3236,9 @@ keycompare_mb (const struct line *a, con
|
||||
size_t lena = lima <= texta ? 0 : lima - texta;
|
||||
size_t lenb = limb <= textb ? 0 : limb - textb;
|
||||
@ -17,7 +37,7 @@ Index: coreutils-8.23/src/sort.c
|
||||
lena = new_len_a; lenb = new_len_b;
|
||||
}
|
||||
+ else
|
||||
+ {
|
||||
+ {
|
||||
+ /* Use the keys in-place, temporarily null-terminated. */
|
||||
+ enda = texta[lena]; texta[lena] = '\0';
|
||||
+ endb = textb[lenb]; textb[lenb] = '\0';
|
||||
@ -50,10 +70,10 @@ Index: coreutils-8.23/src/sort.c
|
||||
|
||||
if (diff)
|
||||
goto not_equal;
|
||||
Index: coreutils-8.23/tests/misc/sort.pl
|
||||
Index: tests/misc/sort.pl
|
||||
===================================================================
|
||||
--- coreutils-8.23.orig/tests/misc/sort.pl
|
||||
+++ coreutils-8.23/tests/misc/sort.pl
|
||||
--- tests/misc/sort.pl.orig
|
||||
+++ tests/misc/sort.pl
|
||||
@@ -322,6 +322,10 @@ my @Tests =
|
||||
["22a", '-k 2,2fd -k 1,1r', {IN=>"3 b\n4 B\n"}, {OUT=>"4 B\n3 b\n"}],
|
||||
["22b", '-k 2,2d -k 1,1r', {IN=>"3 b\n4 b\n"}, {OUT=>"4 b\n3 b\n"}],
|
||||
@ -65,12 +85,11 @@ Index: coreutils-8.23/tests/misc/sort.pl
|
||||
["no-file1", 'no-file', {EXIT=>2}, {ERR=>$no_file}],
|
||||
# This test failed until 1.22f. Sort didn't give an error.
|
||||
# From Will Edgington.
|
||||
@@ -445,7 +449,7 @@ if ($mb_locale ne 'C')
|
||||
}
|
||||
@@ -446,6 +450,7 @@ if ($mb_locale ne 'C')
|
||||
#disable several failing tests until investigation, disable all tests with envvars set
|
||||
next if (grep {ref $_ eq 'HASH' && exists $_->{ENV}} (@new_t));
|
||||
- next if ($test_name =~ "18g" or $test_name =~ "sort-numeric" or $test_name =~ "08[ab]" or $test_name =~ "03[def]" or $test_name =~ "h4" or $test_name =~ "n1" or $test_name =~ "2[01]a");
|
||||
+ next if ($test_name =~ "18g" or $test_name =~ "sort-numeric" or $test_name =~ "08[ab]" or $test_name =~ "03[def]" or $test_name =~ "h4" or $test_name =~ "n1" or $test_name =~ "2[01]a" or $test_name =~ "11[ab]");
|
||||
next if ($test_name =~ "18g" or $test_name =~ "sort-numeric" or $test_name =~ "08[ab]" or $test_name =~ "03[def]" or $test_name =~ "h4" or $test_name =~ "n1" or $test_name =~ "2[01]a");
|
||||
+ next if ($test_name =~ "11[ab]"); # avoid FP: expected result differs to MB result due to collation rules.
|
||||
push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
|
||||
}
|
||||
push @Tests, @new;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user