Kaydet (Commit) ae0e295f authored tarafından Michael Stahl's avatar Michael Stahl

smoketest: unbreak after recent Extension changes

(regression from a714cf18)

Change-Id: Iaf772aa1960bad1ed6b317245867f17a88f6ccd7
üst dd9dba52
......@@ -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:
......@@ -173,7 +173,7 @@ DIM nStrPos as Long
CompatibilityMode(true)
nStrPos = InStrRev (sDocURL, &quot;/&quot; )
CompatibilityMode(false)
sExtensionURL = Left (sDocURL, nStrPos)
sExtensionURL = Left (sDocURL, nStrPos) + &quot;../Extension/&quot; + cExtensionFileName
GlobalTestLog = OpenLogDat (sLogFileName)
call WriteTestSequence
......
......@@ -64,7 +64,7 @@ Sub TestExtensions
&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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment