From 8d346246a75ec5d65859d546f28dc66235b2ea77 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Fri, 2 Dec 2016 11:08:45 +0100 Subject: [PATCH] disable the test-lock gnulib test prone to deadlock See https://lists.gnu.org/archive/html/bug-gnulib/2015-07/msg00033.html and https://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=25fb4c6 for some context. --- coreutils-8.26-test-lock.patch | 35 ++++++++++++++++++++++++++++++++++ coreutils.spec | 5 ++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 coreutils-8.26-test-lock.patch diff --git a/coreutils-8.26-test-lock.patch b/coreutils-8.26-test-lock.patch new file mode 100644 index 0000000..3f2603e --- /dev/null +++ b/coreutils-8.26-test-lock.patch @@ -0,0 +1,35 @@ +From 812480a9fb21b26f2e705b992ce75810f36d08c9 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Fri, 2 Dec 2016 10:12:09 +0100 +Subject: [PATCH] disable the test-lock gnulib test prone to deadlock + +See https://lists.gnu.org/archive/html/bug-gnulib/2015-07/msg00033.html +and https://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=25fb4c6 for +some context. +--- + gnulib-tests/gnulib.mk | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/gnulib-tests/gnulib.mk b/gnulib-tests/gnulib.mk +index 8f32431..c9943d8 100644 +--- a/gnulib-tests/gnulib.mk ++++ b/gnulib-tests/gnulib.mk +@@ -1207,15 +1207,6 @@ EXTRA_DIST += test-localename.c macros.h + + ## end gnulib module localename-tests + +-## begin gnulib module lock-tests +- +-TESTS += test-lock +-check_PROGRAMS += test-lock +-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ +-EXTRA_DIST += test-lock.c +- +-## end gnulib module lock-tests +- + ## begin gnulib module lseek-tests + + TESTS += test-lseek.sh +-- +2.7.4 + diff --git a/coreutils.spec b/coreutils.spec index fd58008..e5e7f26 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -16,7 +16,9 @@ Source10: coreutils-find-requires.sh %global __find_provides %{_rpmconfigdir}/find-provides %global __find_requires %{SOURCE10} %{_rpmconfigdir}/find-requires -# Our patches +# disable the test-lock gnulib test prone to deadlock +Patch1: coreutils-8.26-test-lock.patch + #general patch to workaround koji build system issues Patch100: coreutils-6.10-configuration.patch #add note about no difference between binary/text mode on Linux - md5sum manpage @@ -174,6 +176,7 @@ including documentation and translations. tee DIR_COLORS{,.256color,.lightbgcolor} /dev/null # Our patches +%patch1 -p1 %patch100 -p1 -b .configure %patch101 -p1 -b .manpages %patch102 -p1