[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 01/01: make disable-db-tests.diff and smoketest-disable-extension-tests.diff apply again...

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 6d9ae9c54bfb7210e2260816543734bfe534d636
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Dec 23 11:22:19 2015 +0100

    make disable-db-tests.diff and smoketest-disable-extension-tests.diff apply again...
---
 changelog                                      |  3 +
 patches/disable-db-tests.diff                  | 92 ++++++++++++++++++++++++--
 patches/smoketest-disable-extension-tests.diff | 13 ++--
 3 files changed, 95 insertions(+), 13 deletions(-)

diff --git a/changelog b/changelog
index b6efcbb..c99d3e8 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:5.0.4-1) UNRELEASED; urgency=medium
 
   * LibreOffice 5.0.4 final (identical to rc2)
 
+  * debian/patches/disable-db-tests.diff,
+    debian/patches/smoketest-disable-extension-tests.diff: make apply again...
+
   * debian/tests/control: depend on ure-dbg and uno-libs3-dbg, too 
   * debian/tests/junit-subsequentcheck.diff: run
     ./debian/rules config_host.mk enable_report_builder=no to disable the SRB
diff --git a/patches/disable-db-tests.diff b/patches/disable-db-tests.diff
index beee8f7..f6fc670 100644
--- a/patches/disable-db-tests.diff
+++ b/patches/disable-db-tests.diff
@@ -1,6 +1,6 @@
 diff -urN smoketest-old/data/Test_DB.xml smoketest/data/Test_DB.xml
---- a/smoketest-old/data/Test_DB.xml	2011-12-20 16:05:52.000000000 +0000
-+++ b/smoketest/data/Test_DB.xml	2011-12-29 23:09:08.000000000 +0000
+--- a/smoketest-old/data/Basic/Standard/Test_DB.xml	2011-12-20 16:05:52.000000000 +0000
++++ b/smoketest/data/Basic/Standard/Test_DB.xml	2011-12-29 23:09:08.000000000 +0000
 @@ -30,9 +30,6 @@
  
  const cMessageDatabaseService = &quot;Database Service&quot;
@@ -62,16 +62,96 @@ 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
-@@ -45,9 +45,9 @@
-     Package_uiconfig \
+@@ -34,49 +34,49 @@
+ 	UIConfig_dbtdata \
  ))
  
+-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
++#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 \
 +#))
- #    JunitTest_dbaccess_unoapi \
++#endif
++#endif
+ 
+ endif
  
- # vim: set noet sw=4 ts=4:
diff --git a/patches/smoketest-disable-extension-tests.diff b/patches/smoketest-disable-extension-tests.diff
index af2163f..d011648 100644
--- a/patches/smoketest-disable-extension-tests.diff
+++ b/patches/smoketest-disable-extension-tests.diff
@@ -21,17 +21,16 @@
 
      gCurrentTestCase = cLogfileFailed
      LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest))
-@@ -34,75 +34,5 @@
- 
+@@ -35,74 +35,5 @@
      gCurrentTestCase = cLogfileFailed
      LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest))
--
+ 
 -    sCurrentMessage = &quot;SmokeTestCommandEnvironment (implemented in Java)&quot;
 -    gCurrentTestCase = cEXTService
 -
 -    &apos;Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for
 -    &apos;adding the extension. The implementation is in
--    &apos;javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java and the code is in juh.jar
+-    &apos;smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java and the code is in smoketest.jar
 -    cmdEnv = createUnoService(cUnoSmoketestCommandEnvironment)
 -
 -    &apos;Create the component context and then get the singleton ExtensionManager
@@ -55,7 +54,7 @@
 -    &apos;XExtensionManager only affect the user installation. To modify the share installation one would pass &quot;share&quot;.
 -
 -    Dim props() as Object
--    ext_mgr.addExtension(sExtensionURL + cExtensionFileName, props, &quot;user&quot;, obj_null, cmdEnv)
+-    ext_mgr.addExtension(sExtensionURL, props, &quot;user&quot;, obj_null, cmdEnv)
 -
 -    &apos;Check if the extension has been added by creating a service which is contained in the extension.
 -    oTestExtension = createUnoService(cUnoSmoketestTestExtension)
@@ -71,12 +70,12 @@
 -    gCurrentTestCase = cEXTUninstall
 -
 -    &apos;Remove the package
--    ext_mgr.removeExtension(&quot;org.openoffice.legacy.&quot; + cExtensionFileName, cExtensionFileName, &quot;user&quot;,obj_null, cmdEnv)
+-    ext_mgr.removeExtension(&quot;org.libreoffice.smoketest.TestExtension&quot;, cExtensionFileName, &quot;user&quot;,obj_null, cmdEnv)
 -
 -    &apos;Try to create the service which is contained in the now removed extension.
 -    oTestExtension = createUnoService(cUnoSmoketestTestExtension)
 -
--    &apos;The service must not be available anymore. Therefor isNull must return true.
+-    &apos;The service must not be available anymore. Therefore isNull must return true.
 -    LogTestResult( &quot;Extension &quot;+ cMessageExtensionUninstall, IsNull (oTestExtension) )
 -
 -    Print #LocalTestLog, &quot;---&quot;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: