[Libreoffice-commits] core.git: smoketest/CppunitTest_smoketest.mk smoketest/data

[Michael Stahl]

 smoketest/CppunitTest_smoketest.mk          |    9 +++++++--
 smoketest/data/Basic/Standard/Test_10er.xml |    2 +-
 smoketest/data/Basic/Standard/Test_Ext.xml  |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit ae0e295f6063e63d90561fab8c856685ce2c94c7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jun 7 20:15:25 2013 +0200

    smoketest: unbreak after recent Extension changes
    
    (regression from a714cf18b1c6cadae93df92376a11aeb98b65418)
    
    Change-Id: Iaf772aa1960bad1ed6b317245867f17a88f6ccd7

diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index 0fad801..3915df5 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -42,13 +42,18 @@ $(eval $(call gb_CppunitTest_add_arguments,smoketest,\
 	-env:arg-soffice=$(smoketest_SOFFICE) \
 	-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
 	-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
-	-env:arg-testarg.smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw \
+	-env:arg-testarg.smoketest.doc=$(WORKDIR)/Zip/smoketestdoc.sxw \
 ))
 
-$(call gb_CppunitTest_get_target,smoketest): clean_CustomTarget_smoketest
+$(call gb_CppunitTest_get_target,smoketest): \
+	clean_CustomTarget_smoketest \
+	$(WORKDIR)/Zip/smoketestdoc.sxw
 
 clean_CustomTarget_smoketest:
 	rm -rf $(WORKDIR)/CustomTarget/smoketest
 	mkdir -p $(WORKDIR)/CustomTarget/smoketest
 
+$(WORKDIR)/Zip/smoketestdoc.sxw: $(call gb_Zip_get_target,smoketestdoc)
+	cp $< $@
+
 # vim: set noet sw=4 ts=4:
diff --git a/smoketest/data/Basic/Standard/Test_10er.xml b/smoketest/data/Basic/Standard/Test_10er.xml
index bd774b4..41d06c7 100644
--- a/smoketest/data/Basic/Standard/Test_10er.xml
+++ b/smoketest/data/Basic/Standard/Test_10er.xml
@@ -173,7 +173,7 @@ DIM nStrPos as Long
     CompatibilityMode(true)
     nStrPos = InStrRev (sDocURL, "/" )
     CompatibilityMode(false)
-    sExtensionURL = Left (sDocURL, nStrPos)
+    sExtensionURL = Left (sDocURL, nStrPos) + "../Extension/" + cExtensionFileName
 
     GlobalTestLog = OpenLogDat (sLogFileName)
     call WriteTestSequence
diff --git a/smoketest/data/Basic/Standard/Test_Ext.xml b/smoketest/data/Basic/Standard/Test_Ext.xml
index 364a6a6..2984ff6 100644
--- a/smoketest/data/Basic/Standard/Test_Ext.xml
+++ b/smoketest/data/Basic/Standard/Test_Ext.xml
@@ -64,7 +64,7 @@ Sub TestExtensions
     'XExtensionManager only affect the user installation. To modify the share installation one would pass "share".
 
     Dim props() as Object
-    ext_mgr.addExtension(sExtensionURL + cExtensionFileName, props, "user", obj_null, cmdEnv)
+    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)