diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:55:35 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:55:35 +0000 |
commit | 0e05dd0e4d67d88ca51780dafe4029744269e6fa (patch) | |
tree | b49073fa569d8d4fbcc7002cf4df72fa840780c1 /debian/tests/patches/smoketest-disable-extension-tests.diff | |
parent | Adding upstream version 4:24.2.0. (diff) | |
download | libreoffice-0e05dd0e4d67d88ca51780dafe4029744269e6fa.tar.xz libreoffice-0e05dd0e4d67d88ca51780dafe4029744269e6fa.zip |
Adding debian version 4:24.2.0-1.debian/4%24.2.0-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/tests/patches/smoketest-disable-extension-tests.diff')
-rw-r--r-- | debian/tests/patches/smoketest-disable-extension-tests.diff | 117 |
1 files changed, 117 insertions, 0 deletions
diff --git a/debian/tests/patches/smoketest-disable-extension-tests.diff b/debian/tests/patches/smoketest-disable-extension-tests.diff new file mode 100644 index 0000000000..48e8fddea3 --- /dev/null +++ b/debian/tests/patches/smoketest-disable-extension-tests.diff @@ -0,0 +1,117 @@ +--- smoketest/data/Basic/Standard/Test_Ext.xml 2012-02-01 13:56:49.000000000 +0100 ++++ smoketest/data/Basic/Standard/Test_Ext.xml 2012-02-20 20:15:23.000000000 +0100 +@@ -28,10 +28,6 @@ + <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd"> + <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Test_Ext" script:language="StarBasic">REM ***** BASIC ***** + +-const cMessageExtensionService = "Extension Service" +-const cMessageExtensionInstall = "Install Extension" +-const cMessageExtensionUninstall = "Uninstall Extension" +- + Sub TestExtensions + Dim oTestExtension as Object, obj_null as Object + Dim sCurrentMessage as String +@@ -37,9 +37,6 @@ + Dim sCurrentMessage as String + Dim bResult as Boolean + Dim sImplementationNameString as String +- sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension" +- +- On Local Error GoTo EXTERROR + + gCurrentTestCase = cLogfileFailed + LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest)) +@@ -35,74 +35,5 @@ + gCurrentTestCase = cLogfileFailed + LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest)) + +- sCurrentMessage = "SmokeTestCommandEnvironment (implemented in Java)" +- gCurrentTestCase = cEXTService +- +- 'Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for +- 'adding the extension. The implementation is in +- 'smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java and the code is in smoketest.jar +- cmdEnv = createUnoService(cUnoSmoketestCommandEnvironment) +- +- 'Create the component context and then get the singleton ExtensionManager +- 'A singleton cannot be created with createUnoService +- sCurrentMessage = cMessageExtensionService +- ctx = getDefaultContext +- ext_mgr = ctx.getValueByName("/singletons/" + cExtensionManager) +- +- LogTestResult( "Extension "+ cMessageExtensionService, not IsNull (ext_mgr) ) +- if (IsNull(ext_mgr)) then +- Close #LocalTestLog% +- LocalTestLog = 0 +- Exit Sub +- End If +- +- sCurrentMessage = cMessageExtensionInstall +- gCurrentTestCase = cEXTInstall +- +- 'Add the extension. We must provide a file URL here. +- 'By passing "user" we determine that the actions we perform on +- 'XExtensionManager only affect the user installation. To modify the share installation one would pass "share". +- +- Dim props() as Object +- ext_mgr.addExtension(sExtensionURL, props, "user", obj_null, cmdEnv) +- +- 'Check if the extension has been added by creating a service which is contained in the extension. +- oTestExtension = createUnoService(cUnoSmoketestTestExtension) +- bResult = (oTestExtension.getImplementationName = sImplementationNameString) +- LogTestResult( "Extension "+ cMessageExtensionInstall, bResult ) +- if (not bResult) then +- Close #LocalTestLog% +- LocalTestLog = 0 +- Exit Sub +- End If +- +- sCurrentMessage = cMessageExtensionUninstall +- gCurrentTestCase = cEXTUninstall +- +- 'Remove the package +- ext_mgr.removeExtension("org.libreoffice.smoketest.TestExtension", cExtensionFileName, "user",obj_null, cmdEnv) +- +- 'Try to create the service which is contained in the now removed extension. +- oTestExtension = createUnoService(cUnoSmoketestTestExtension) +- +- 'The service must not be available anymore. Therefore isNull must return true. +- LogTestResult( "Extension "+ cMessageExtensionUninstall, IsNull (oTestExtension) ) +- +- Print #LocalTestLog, "---" +- Close #LocalTestLog% +- LocalTestLog = 0 +- Exit Sub ' Without error +- +- EXTERROR: +- If ( gCurrentTestCase = cLogfileFailed ) then +- LogTestResult( " ", False ) +- Exit Sub +- else +- LogTestResult( "Extension "+ sCurrentMessage, False ) +- Close #LocalTestLog% +- LocalTestLog = 0 +- End If +- Exit Sub ' With error +- + End Sub + </script:module> + +run the smoketest also when extensions are disabled; we patch that out of the smoketest anyway + +--- smoketest/Module_smoketest.mk-old 2023-07-19 06:46:58.379072423 +0200 ++++ smoketest/Module_smoketest.mk 2023-07-19 06:47:09.547147319 +0200 +@@ -34,13 +34,11 @@ + + ifeq ($(ENABLE_CPPUNIT),TRUE) + ifneq (MACOSX/TRUE,$(OS)/$(ENABLE_MACOSX_SANDBOX)) +-ifneq ($(filter EXTENSIONS,$(BUILD_TYPE)),) + $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\ + CppunitTest_smoketest \ + )) + endif + endif +-endif + + endif + |