- unified bcond descriptions

[packages/libreoffice.git] / disable-failing-test.patch

diff --git a/disable-failing-test.patch b/disable-failing-test.patch
index 66078f3f48d4c39e598168f62720ddf306575c13..320865b0217e46798d83b864aa164c5d95119804 100644 (file)
--- a/disable-failing-test.patch
+++ b/disable-failing-test.patch
@@ -1,42 +1,48 @@
---- a/writerperfect/Module_writerperfect.mk
-+++ b/writerperfect/Module_writerperfect.mk
-@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_check_targets,writerperfect,\
-       CppunitTest_writerperfect_calc \
-       CppunitTest_writerperfect_draw \
-       CppunitTest_writerperfect_impress \
--      CppunitTest_writerperfect_writer \
-       StaticLibrary_writerperfect_importtestbase \
- ))
+--- libreoffice-6.0.0.3/sd/qa/unit/import-tests.cxx~   2018-01-24 21:31:03.000000000 +0100
++++ libreoffice-6.0.0.3/sd/qa/unit/import-tests.cxx    2018-02-02 08:36:16.309008496 +0100
+@@ -171,7 +171,6 @@ public:
+ 
+     CPPUNIT_TEST_SUITE(SdImportTest);
  
---- libreoffice-5.0.2.1/dbaccess/Module_dbaccess.mk~   2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/dbaccess/Module_dbaccess.mk    2015-09-17 08:53:09.973934654 +0200
-@@ -49,12 +49,6 @@
-               CppunitTest_dbaccess_RowSetClones) \
+-    CPPUNIT_TEST(testDocumentLayout);
+     CPPUNIT_TEST(testSmoketest);
+     CPPUNIT_TEST(testN759180);
+     CPPUNIT_TEST(testN778859);
+--- libreoffice-6.0.0.3/sw/qa/extras/uiwriter/uiwriter.cxx~    2018-01-24 21:31:03.000000000 +0100
++++ libreoffice-6.0.0.3/sw/qa/extras/uiwriter/uiwriter.cxx     2018-02-02 08:41:59.126211831 +0100
+@@ -532,7 +532,6 @@ public:
+     CPPUNIT_TEST(testTdf114306_2);
+     CPPUNIT_TEST(testTdf113481);
+     CPPUNIT_TEST(testTdf115013);
+-    CPPUNIT_TEST(testTdf114536);
+     CPPUNIT_TEST(testTdf115065);
+     CPPUNIT_TEST(testTdf115132);
+     CPPUNIT_TEST(testXDrawPagesSupplier);
+
+--- libreoffice-6.3.0.4/dbaccess/Module_dbaccess.mk~   2019-08-06 19:26:35.000000000 +0200
++++ libreoffice-6.3.0.4/dbaccess/Module_dbaccess.mk    2019-08-09 09:06:37.432422956 +0200
+@@ -33,24 +33,6 @@
  ))
  
--ifeq ($(ENABLE_JAVA),TRUE)
+ ifneq ($(OS),iOS)
+-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
 -$(eval $(call gb_Module_add_check_targets,dbaccess,\
--    CppunitTest_dbaccess_hsqldb_test \
+-    $(if $(ENABLE_JAVA),CppunitTest_dbaccess_hsqlbinary_import) \
+-    $(if $(ENABLE_JAVA),CppunitTest_dbaccess_tdf119625) \
+-    $(if $(ENABLE_JAVA),CppunitTest_dbaccess_tdf126268) \
 -))
--endif
 -
- # This runs a suite of peformance tests on embedded firebird and HSQLDB.
- # Instructions on running the test can be found in qa/unit/embeddedb_performancetest
- ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
---- libreoffice-5.0.2.1/sw/qa/extras/ooxmlimport/ooxmlimport.cxx~      2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/sw/qa/extras/ooxmlimport/ooxmlimport.cxx       2015-09-17 14:57:25.802634256 +0200
-@@ -2759,14 +2759,6 @@
-     CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getProperty<sal_Int16>(xTableRows->getByIndex(0), "SizeType"));
- }
- 
--DECLARE_OOXMLIMPORT_TEST(testTdf87924, "tdf87924.docx")
--{
--    uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY);
--    comphelper::SequenceAsHashMap aGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
--    // This was -270, the text rotation angle was set when it should not be rotated.
--    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aGeometry["TextPreRotateAngle"].get<sal_Int32>());
--}
+-# remove if we have a be file for this
+-ifeq ($(ENDIANNESS),little)
+-$(eval $(call gb_Module_add_check_targets,dbaccess,\
+-    CppunitTest_dbaccess_firebird_regression_test \
+-))
+-endif
+-$(eval $(call gb_Module_add_check_targets,dbaccess,\
+-    CppunitTest_dbaccess_firebird_test \
+-))
+-endif
 -
- #endif
- 
- CPPUNIT_PLUGIN_IMPLEMENT();
+ $(eval $(call gb_Module_add_check_targets,dbaccess,\
+       CppunitTest_dbaccess_dialog_save \
+       CppunitTest_dbaccess_empty_stdlib_save \