rpms
/
augeas
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable gnulib test-lock, which hangs during check 

Related to BZ#1410052, BZ#1406031, and
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/PQD576JZLERFY6ROI3GF7UYXKZIRI33G/
This commit is contained in:
Dominic Cleal 2017-03-21 14:04:11 +00:00
parent 79693543fc
commit 62ecc80b42
No known key found for this signature in database
GPG Key ID: 7C7D326F2C2B72CC
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
augeas.spec
View File

@ -7,6 +7,8 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://augeas.net/
Source0: http://download.augeas.net/%{name}-%{version}.tar.gz
# Disable gnulib test-lock, which hangs during check (related to BZ#1410052, BZ#1406031)
Patch0: gnulib-disable-test-lock.patch
BuildRequires: readline-devel libselinux-devel libxml2-devel
Requires: %{name}-libs = %{version}-%{release}
@ -46,6 +48,7 @@ read files.
%prep
%setup -q
%patch0 -p1
%build
%configure \

40
gnulib-disable-test-lock.patch Normal file
View File

@ -0,0 +1,40 @@
diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.am augeas-1.8.0/gnulib/tests/Makefile.am
--- augeas-1.8.0.old/gnulib/tests/Makefile.am 2016-09-29 20:15:19.000000000 +0100
+++ augeas-1.8.0/gnulib/tests/Makefile.am 2017-03-21 15:14:45.209782946 +0000
@@ -515,15 +515,6 @@
## 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 lstat-tests
TESTS += test-lstat
diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.in augeas-1.8.0/gnulib/tests/Makefile.in
--- augeas-1.8.0.old/gnulib/tests/Makefile.in 2017-03-20 22:17:04.000000000 +0000
+++ augeas-1.8.0/gnulib/tests/Makefile.in 2017-03-21 15:15:05.211646356 +0000
@@ -126,7 +126,7 @@
test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
- test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
+ test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc-w32-1.sh \
test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
@@ -170,7 +170,7 @@
test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
- test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
+ test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \
test-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \
test-memchr$(EXEEXT) test-nl_langinfo$(EXEEXT) \