Resolves: rhbz#2027211 enable make check on s390x
This commit is contained in:
parent
f95c2caa3f
commit
9da41523e8
@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
|
||||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: %{libo_version}.2
|
||||
Release: 3%{?libo_prerelease}%{?dist}
|
||||
Release: 4%{?libo_prerelease}%{?dist}
|
||||
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
|
||||
URL: http://www.libreoffice.org/
|
||||
|
||||
@ -1027,6 +1027,11 @@ sed -i -e /CppunitTest_xmlsecurity_signing/d xmlsecurity/Module_xmlsecurity.mk
|
||||
sed -i -e /CppunitTest_xmlsecurity_pdfsigning/d xmlsecurity/Module_xmlsecurity.mk
|
||||
sed -i -e /CppunitTest_sal_osl/d sal/Module_sal.mk
|
||||
sed -i -e /CppunitTest_emfio_emf/d emfio/Module_emfio.mk
|
||||
%ifarch s390x
|
||||
sed -i -e /CppunitTest_dbaccess_hsqlbinary_import/d dbaccess/Module_dbaccess.mk
|
||||
sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk
|
||||
sed -i -e /CustomTarget_uno_test/d testtools/Module_testtools.mk
|
||||
%endif
|
||||
|
||||
git commit -q -a -m 'temporarily disable failing tests'
|
||||
|
||||
@ -1510,11 +1515,9 @@ for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do
|
||||
done
|
||||
|
||||
%check
|
||||
%ifnarch s390x
|
||||
make unitcheck slowcheck
|
||||
# we don't need this anymore
|
||||
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
|
||||
%endif
|
||||
|
||||
%files
|
||||
|
||||
@ -2249,6 +2252,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_includedir}/LibreOfficeKit
|
||||
|
||||
%changelog
|
||||
* Wed Dec 01 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.7.2-4
|
||||
- Resolves: rhbz#2027211 enable make check on s390x
|
||||
|
||||
* Mon Nov 22 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.7.2-3
|
||||
- Resolves: rhbz2023185 merge in fedora 34 changes
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user