spec: try to work around racy testsuite on ppc
Version: 3.1.2-5
This commit is contained in:
parent
7615a7f21c
commit
bbde57d99f
@ -1,6 +1,6 @@
|
|||||||
Name: libarchive
|
Name: libarchive
|
||||||
Version: 3.1.2
|
Version: 3.1.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: A library for handling streaming archive formats
|
Summary: A library for handling streaming archive formats
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -92,19 +92,34 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
|||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
LD_LIBRARY_PATH=`pwd`/.libs make check -j1 || (
|
run_testsuite()
|
||||||
# error happened - try to extract in koji as much info as possible
|
{
|
||||||
cat test-suite.log
|
LD_LIBRARY_PATH=`pwd`/.libs make check -j1
|
||||||
echo "========================="
|
res=$?
|
||||||
err=`cat test-suite.log | grep "Details for failing tests" | cut -d: -f2`
|
echo $res
|
||||||
for i in $err; do
|
if [ $res -ne 0 ]; then
|
||||||
find $i -printf "%p\n ~> %c\n ~> %s B\n"
|
# error happened - try to extract in koji as much info as possible
|
||||||
echo "-------------------------"
|
cat test-suite.log
|
||||||
cat $i/*.log
|
echo "========================="
|
||||||
done
|
err=`cat test-suite.log | grep "Details for failing tests" | cut -d: -f2`
|
||||||
false # stop here
|
for i in $err; do
|
||||||
)
|
find $i -printf "%p\n ~> a: %a\n ~> c: %c\n ~> t: %t\n ~> %s B\n"
|
||||||
|
echo "-------------------------"
|
||||||
|
cat $i/*.log
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
run_testsuite
|
||||||
|
%ifarch ppc
|
||||||
|
# On a ppc/ppc64 is some race condition causing 'make check' fail on ppc
|
||||||
|
# when both 32 and 64 builds are done in parallel on the same machine in
|
||||||
|
# koji. Try to run once again if failed.
|
||||||
|
test $? -ne 0 && run_testsuite
|
||||||
|
%endif
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -147,6 +162,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 22 2013 Pavel Raiskup <praiskup@redhat.com> - 3.1.2-5
|
||||||
|
- try to workaround racy testsuite fail
|
||||||
|
|
||||||
* Sun Jun 30 2013 Pavel Raiskup <praiskup@redhat.com> - 3.1.2-4
|
* Sun Jun 30 2013 Pavel Raiskup <praiskup@redhat.com> - 3.1.2-4
|
||||||
- enable testsuite in the %%check phase
|
- enable testsuite in the %%check phase
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user