From 80725ad1fcd92e60150a57965c26d909552c3129 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 22 Sep 2021 14:34:34 +0200 Subject: [PATCH] Enable check also for s390x ...and for now disable the handful of tests that only fail on s390x, until they have been debugged and fixed: * CppunitTest_dbaccess_hsqlbinary_import: > [_RUN_____] HsqlBinaryImportTest::testBinaryImport > /builddir/build/BUILD/libreoffice-7.2.1.2/dbaccess/qa/unit/hsql_binary_import.cxx:67:HsqlBinaryImportTest::testBinaryImport > equality assertion failed > - Expected: laser eye > - Actual : > HsqlBinaryImportTest::testBinaryImport finished in: 383ms * CppunitTest_vcl_svm_test: > [_RUN_____] SvmTest::testBitmaps > /builddir/build/BUILD/libreoffice-7.2.1.2/test/source/xmltesttools.cxx:171:SvmTest::testBitmaps > equality assertion failed > - Expected: b8dee5da > - Actual : 5e01ddcc > - In <>, attribute 'crc' of '/metafile/bmp[1]' incorrect value. > SvmTest::testBitmaps finished in: 0ms > [_RUN_____] SvmTest::testBitmapExs > /builddir/build/BUILD/libreoffice-7.2.1.2/test/source/xmltesttools.cxx:171:SvmTest::testBitmapExs > equality assertion failed > - Expected: d8377d4f > - Actual : 08feb5d3 > - In <>, attribute 'crc' of '/metafile/bmpex[1]' incorrect value. > SvmTest::testBitmapExs finished in: 2ms * CustomTarget_testtools/uno_test: > ### float does not match! failed > struct comparison test failed > ### float does not match! failed > recursive test results failed > standard test failed --- libreoffice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index b0df884..5cf15e2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1015,6 +1015,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' @@ -1511,11 +1516,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