Accepting request 1030521 from home:berny:branches:Base:System
- coreutils-tests-workaround-make-fdleak.patch: Add patch to work around a GNU make bug which leaks file descriptors when using the jobserver; this makes some tests fail on OBS. - coreutils.spec: Reference the patch. OBS-URL: https://build.opensuse.org/request/show/1030521 OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=342
This commit is contained in:
parent
f8108f3a9d
commit
2b6b7ce591
25
coreutils-tests-workaround-make-fdleak.patch
Normal file
25
coreutils-tests-workaround-make-fdleak.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
---
|
||||||
|
tests/init.sh | 10 ++++++++++
|
||||||
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
|
Index: tests/init.sh
|
||||||
|
===================================================================
|
||||||
|
--- tests/init.sh.orig
|
||||||
|
+++ tests/init.sh
|
||||||
|
@@ -685,6 +685,16 @@ compare ()
|
||||||
|
}
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
+# OpenSUSE/OSC workaround.
|
||||||
|
+# GNU make 4.3.90 leaks a lot of file descriptors when using the jobserver.
|
||||||
|
+# Close all of them pointing to files matching '/tmp/Gm*'.
|
||||||
|
+p=$$
|
||||||
|
+for n in $(find /proc/$p/fd -lname '/tmp/Gm*' -printf '%P\n'); do
|
||||||
|
+ exec {n}>&-
|
||||||
|
+done
|
||||||
|
+# -----------------------------------------------------------------------------
|
||||||
|
+
|
||||||
|
+# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# If you want to override the testdir_prefix_ function,
|
||||||
|
# or to add more utility functions, use this file.
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 26 20:29:11 UTC 2022 - Bernhard Voelker <mail@bernhard-voelker.de>
|
||||||
|
|
||||||
|
- coreutils-tests-workaround-make-fdleak.patch: Add patch to work around
|
||||||
|
a GNU make bug which leaks file descriptors when using the jobserver;
|
||||||
|
this makes some tests fail.
|
||||||
|
- coreutils.spec: Reference the patch.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Aug 9 12:13:00 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
Tue Aug 9 12:13:00 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
@ -64,6 +64,7 @@ Patch501: coreutils-test_without_valgrind.patch
|
|||||||
Patch810: coreutils-skip-tests-rm-ext3-perf.patch
|
Patch810: coreutils-skip-tests-rm-ext3-perf.patch
|
||||||
# Upstream patch - remove with version >9.1:
|
# Upstream patch - remove with version >9.1:
|
||||||
Patch850: gnulib-simple-backup-fix.patch
|
Patch850: gnulib-simple-backup-fix.patch
|
||||||
|
Patch900: coreutils-tests-workaround-make-fdleak.patch
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: gmp-devel
|
BuildRequires: gmp-devel
|
||||||
BuildRequires: hostname
|
BuildRequires: hostname
|
||||||
@ -159,6 +160,7 @@ This package contains the documentation for the GNU Core Utilities.
|
|||||||
|
|
||||||
%patch810
|
%patch810
|
||||||
%patch850
|
%patch850
|
||||||
|
%patch900
|
||||||
|
|
||||||
# ================================================
|
# ================================================
|
||||||
%build
|
%build
|
||||||
@ -194,13 +196,13 @@ ln -v lib/parse-datetime.{c,y} .
|
|||||||
chmod a+x tests/misc/sort-mb-tests.sh
|
chmod a+x tests/misc/sort-mb-tests.sh
|
||||||
# Avoid parallel make, because otherwise some timeout based tests like
|
# Avoid parallel make, because otherwise some timeout based tests like
|
||||||
# rm/ext3-perf may fail due to high CPU or IO load.
|
# rm/ext3-perf may fail due to high CPU or IO load.
|
||||||
%make_build check-very-expensive \
|
%make_build check-very-expensive VERBOSE=yes \
|
||||||
&& install -d -m 755 %{buildroot}%{_docdir}/%{name} \
|
&& install -d -m 755 %{buildroot}%{_docdir}/%{name} \
|
||||||
&& xz -c tests/test-suite.log \
|
&& xz -c tests/test-suite.log \
|
||||||
> %{buildroot}%{_docdir}/%{name}/test-suite.log.xz
|
> %{buildroot}%{_docdir}/%{name}/test-suite.log.xz
|
||||||
%else
|
%else
|
||||||
# Run the shorter check otherwise.
|
# Run the shorter check otherwise.
|
||||||
%make_build check
|
%make_build check VERBOSE=yes
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# ================================================
|
# ================================================
|
||||||
|
Loading…
Reference in New Issue
Block a user