Hello community, here is the log from the commit of package coreutils for openSUSE:Factory checked in at 2013-05-27 09:43:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coreutils (Old) and /work/SRC/openSUSE:Factory/.coreutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "coreutils" Changes: -------- --- /work/SRC/openSUSE:Factory/coreutils/coreutils-testsuite.changes 2013-04-26 12:37:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.coreutils.new/coreutils-testsuite.changes 2013-05-27 09:43:31.000000000 +0200 @@ -1,0 +2,14 @@ +Mon May 20 15:38:30 UTC 2013 - [email protected] + +- Try to fix nap() races in gnulib-tests. + (coreutils-gnulib-tests-fix-nap-race.patch: add upstream patch) + (coreutils-gnulib-tests-fix-nap-race-obs.patch: add openSUSE patch for OBS) + +------------------------------------------------------------------- +Wed May 15 11:26:29 UTC 2013 - [email protected] + +- Provides: /bin/{kill,su} + * for compatibility with programs requiring these (like lsb) until these will + be provided by util-linux + +------------------------------------------------------------------- coreutils.changes: same change New: ---- coreutils-gnulib-tests-fix-nap-race-obs.patch coreutils-gnulib-tests-fix-nap-race.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.xOY3nU/_old 2013-05-27 09:43:32.000000000 +0200 +++ /var/tmp/diff_new_pack.xOY3nU/_new 2013-05-27 09:43:32.000000000 +0200 @@ -44,6 +44,8 @@ Provides: %{name} = %{version} %if "%{name}" == "coreutils" +Provides: /bin/kill +Provides: /bin/su Provides: fileutils = %{version} Provides: mktemp = %{version} Provides: sh-utils = %{version} @@ -95,6 +97,13 @@ Patch100: coreutils-build-timeout-as-pie.patch Patch101: coreutils-su.patch +# Fix gnulib-test failures related to gnulib-tests/nap.h. +Patch200: coreutils-gnulib-tests-fix-nap-race.patch + +# Fix gnulib-test failures: increase nap() delay multiplier even +# a bit more to avoid failures on OBS. +Patch201: coreutils-gnulib-tests-fix-nap-race-obs.patch + # ================================================ %description These are the GNU core utilities. This package is the union of @@ -131,6 +140,9 @@ %patch100 %patch101 +%patch200 +%patch201 + xz -dc %{S:4} >po/de.po #???## We need to statically link to gmp, otherwise we have a build loop @@ -159,7 +171,6 @@ %if "%{name}" == "coreutils-testsuite" # Make our multi-byte test for sort executable chmod a+x tests/misc/sort-mb-tests.sh - # Avoid parallel make, because otherwise some timeout based tests like # rm/ext3-perf may fail due to high CPU or IO load. make check-very-expensive \ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.xOY3nU/_old 2013-05-27 09:43:32.000000000 +0200 +++ /var/tmp/diff_new_pack.xOY3nU/_new 2013-05-27 09:43:32.000000000 +0200 @@ -44,6 +44,8 @@ Provides: %{name} = %{version} %if "%{name}" == "coreutils" +Provides: /bin/kill +Provides: /bin/su Provides: fileutils = %{version} Provides: mktemp = %{version} Provides: sh-utils = %{version} @@ -95,6 +97,13 @@ Patch100: coreutils-build-timeout-as-pie.patch Patch101: coreutils-su.patch +# Fix gnulib-test failures related to gnulib-tests/nap.h. +Patch200: coreutils-gnulib-tests-fix-nap-race.patch + +# Fix gnulib-test failures: increase nap() delay multiplier even +# a bit more to avoid failures on OBS. +Patch201: coreutils-gnulib-tests-fix-nap-race-obs.patch + # ================================================ %description These are the GNU core utilities. This package is the union of @@ -131,6 +140,9 @@ %patch100 %patch101 +%patch200 +%patch201 + xz -dc %{S:4} >po/de.po #???## We need to statically link to gmp, otherwise we have a build loop @@ -159,7 +171,6 @@ %if "%{name}" == "coreutils-testsuite" # Make our multi-byte test for sort executable chmod a+x tests/misc/sort-mb-tests.sh - # Avoid parallel make, because otherwise some timeout based tests like # rm/ext3-perf may fail due to high CPU or IO load. make check-very-expensive \ ++++++ coreutils-gnulib-tests-fix-nap-race-obs.patch ++++++ From: Bernhard Voelker <[email protected]> Date: Mon, 20 May 2013 00:03:20 +0200 Subject: [PATCH] tests/nap.h: increase delay multiplier to avoid problems in VMs like OBS The gnulib change http://git.sv.gnu.org/cgit/gnulib.git/commit/?id=5191133e (available upstreams with >= 8.22, applied to openSUSE's coreutils package with "coreutils-gnulib-tests-fix-nap-race.patch", decreased the probability of lost races to about a third, however such problems could still be observed in virtual machines like OBS. Increasing the factor from 1.125 to 3 seems to close the race window. * tests/nap.h (nap): Change the multiplier for the delay from 1.125 to 3. --- gnulib-tests/nap.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: gnulib-tests/nap.h =================================================================== --- gnulib-tests/nap.h.orig +++ gnulib-tests/nap.h @@ -126,9 +126,11 @@ nap (void) /* Multiply by 1.125 (rounding up), to avoid problems if the file system's clock is a bit slower than nanosleep's. + OBS: use 3 as multiplier to avoid this race a bit better + which is even more likely in VMs. Ceiling it at INT_MAX, though. */ - int delta = (d >> 3) + ((d & 7) != 0); - d = delta < INT_MAX - d ? d + delta : INT_MAX; + int d2 = 3 * d; + d = d2 < INT_MAX ? d2 : INT_MAX; delay.tv_sec = d / 1000000000; delay.tv_nsec = d % 1000000000; } ++++++ coreutils-gnulib-tests-fix-nap-race.patch ++++++ ++++ 1071 lines (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
