[libreoffice] 02/04: debian/patches/disable-db-tests.diff: update
Rene Engelhard
rene at moszumanska.debian.org
Thu Jun 8 19:59:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit fcaee27e5f7c623c63f8571473ed94c683cd54c3
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Thu Jun 8 13:48:53 2017 +0200
debian/patches/disable-db-tests.diff: update
---
changelog | 2 ++
patches/disable-db-tests.diff | 54 +++++--------------------------------------
2 files changed, 8 insertions(+), 48 deletions(-)
diff --git a/changelog b/changelog
index 27a9018..4a69115 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,7 @@
libreoffice (1:5.4.0~beta2-2) UNRELEASED; urgency=medium
+ * debian/patches/disable-db-tests.diff: update
+
* debian/rules:
- try harder and also export LC_ALL=C.UTF-8 for uitest as the
buildd/sbuild sets LC_ALL=POSIX already
diff --git a/patches/disable-db-tests.diff b/patches/disable-db-tests.diff
index f6fc670..87881a1 100644
--- a/patches/disable-db-tests.diff
+++ b/patches/disable-db-tests.diff
@@ -62,7 +62,7 @@ diff -urN smoketest-old/data/Test_DB.xml smoketest/data/Test_DB.xml
oDBConnection.Dispose()
--- a/dbaccess/Module_dbaccess.mk-old 2012-04-27 23:27:39.194936746 +0200
+++ b/dbaccess/Module_dbaccess.mk 2012-04-27 23:27:47.102975960 +0200
-@@ -34,49 +34,49 @@
+@@ -34,50 +34,6 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\
UIConfig_dbtdata \
))
@@ -87,7 +87,7 @@ diff -urN smoketest-old/data/Test_DB.xml smoketest/data/Test_DB.xml
-))
-endif
-
--# This runs a suite of peformance tests on embedded firebird and HSQLDB.
+-# This runs a suite of performance tests on embedded firebird and HSQLDB.
-# Instructions on running the test can be found in qa/unit/embeddedb_performancetest
-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
-ifeq ($(ENABLE_JAVA),TRUE)
@@ -109,49 +109,7 @@ diff -urN smoketest-old/data/Test_DB.xml smoketest/data/Test_DB.xml
-))
-endif
-endif
-+#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 \
-+# CppunitTest_dbaccess_nolib_save \
-+# CppunitTest_dbaccess_macros_test \
-+# $(if $(ENABLE_JAVA), \
-+# CppunitTest_dbaccess_RowSetClones) \
-+#))
-+#
-+#ifeq ($(ENABLE_JAVA),TRUE)
-+#$(eval $(call gb_Module_add_check_targets,dbaccess,\
-+# CppunitTest_dbaccess_hsqldb_test \
-+#))
-+#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)
-+#ifeq ($(ENABLE_JAVA),TRUE)
-+#$(eval $(call gb_Module_add_check_targets,dbaccess,\
-+# CppunitTest_dbaccess_embeddeddb_performancetest \
-+#))
-+#endif
-+#endif
-+#
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
-+# JunitTest_dbaccess_complex \
-+# JunitTest_dbaccess_unoapi \
-+#))
-+#
-+#ifneq ($(DISABLE_PYTHON),TRUE)
-+#ifneq ($(ENABLE_JAVA),)
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
-+# PythonTest_dbaccess_python \
-+#))
-+#endif
-+#endif
-
- endif
-
+-
+ # screenshots
+ $(eval $(call gb_Module_add_screenshot_targets,dbaccess,\
+ CppunitTest_dbaccess_dialogs_test \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list