- unified bcond descriptions

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

diff --git a/disable-failing-test.patch b/disable-failing-test.patch
index bd265d8811ee76dfe18136cf378425c8cb235347..320865b0217e46798d83b864aa164c5d95119804 100644 (file)
--- a/disable-failing-test.patch
+++ b/disable-failing-test.patch
@@ -1,18 +1,3 @@
---- libreoffice-6.0.0.3/dbaccess/Module_dbaccess.mk~   2018-01-24 21:31:03.000000000 +0100
-+++ libreoffice-6.0.0.3/dbaccess/Module_dbaccess.mk    2018-02-02 08:33:38.287577102 +0100
-@@ -32,12 +32,6 @@ $(eval $(call gb_Module_add_l10n_targets
- ))
- 
- ifneq ($(OS),IOS)
--ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
--$(eval $(call gb_Module_add_check_targets,dbaccess,\
--    CppunitTest_dbaccess_firebird_test \
--))
--endif
--
- $(eval $(call gb_Module_add_check_targets,dbaccess,\
-       CppunitTest_dbaccess_dialog_save \
-       CppunitTest_dbaccess_empty_stdlib_save \
 --- 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:
@@ -25,12 +10,39 @@
      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
-@@ -480,7 +480,6 @@ public:
-     CPPUNIT_TEST(testTdf113790);
-     CPPUNIT_TEST(testTdf114306);
+@@ -532,7 +532,6 @@ public:
      CPPUNIT_TEST(testTdf114306_2);
+     CPPUNIT_TEST(testTdf113481);
+     CPPUNIT_TEST(testTdf115013);
 -    CPPUNIT_TEST(testTdf114536);
      CPPUNIT_TEST(testTdf115065);
-     CPPUNIT_TEST(testTdf115013);
-     CPPUNIT_TEST_SUITE_END();
+     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 @@
+ ))
+ 
+ ifneq ($(OS),iOS)
+-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
+-$(eval $(call gb_Module_add_check_targets,dbaccess,\
+-    $(if $(ENABLE_JAVA),CppunitTest_dbaccess_hsqlbinary_import) \
+-    $(if $(ENABLE_JAVA),CppunitTest_dbaccess_tdf119625) \
+-    $(if $(ENABLE_JAVA),CppunitTest_dbaccess_tdf126268) \
+-))
+-
+-# 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
+-
+ $(eval $(call gb_Module_add_check_targets,dbaccess,\
+       CppunitTest_dbaccess_dialog_save \
+       CppunitTest_dbaccess_empty_stdlib_save \