[packages/zlib] - move asm patch into asm bcond; fail build if test suite fails
arekm
arekm at pld-linux.org
Mon Jan 2 20:20:38 CET 2017
commit f31d59aa96415ece48a04b39487d9cdcc48c2804
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Jan 2 20:20:27 2017 +0100
- move asm patch into asm bcond; fail build if test suite fails
zlib.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/zlib.spec b/zlib.spec
index ff47d01..f47c72e 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -292,9 +292,9 @@ Ten pakiet zawiera statyczną wersję biblioteki minizip.
%prep
%setup -q
-%patch0 -p1
%if %{with asmopt}
+%patch0 -p1
%ifarch i686 pentium3 pentium4 athlon
cp contrib/asm686/match.S .
%endif
@@ -326,7 +326,10 @@ cd contrib/minizip
%{__make} -j1
cd ../..
-%{?with_tests:%{__make} -j1 check}
+%if %{with tests}
+%{__make} -j1 check 2>&1 | tee test-log
+grep -q FAILED test-log && exit 1
+%endif
%install
rm -rf $RPM_BUILD_ROOT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zlib.git/commitdiff/f31d59aa96415ece48a04b39487d9cdcc48c2804
More information about the pld-cvs-commit
mailing list