summaryrefslogtreecommitdiff
path: root/smoketest/CppunitTest_smoketest.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-06-07 20:15:25 +0200
committerMichael Stahl <mstahl@redhat.com>2013-06-07 20:29:35 +0200
commitae0e295f6063e63d90561fab8c856685ce2c94c7 (patch)
tree1ed3665ad48cb1943c8b19eb06bfbb366c121b94 /smoketest/CppunitTest_smoketest.mk
parentdd9dba52f3db38ecf9e6b5c5150219e59579d54b (diff)
smoketest: unbreak after recent Extension changes
(regression from a714cf18b1c6cadae93df92376a11aeb98b65418) Change-Id: Iaf772aa1960bad1ed6b317245867f17a88f6ccd7
Diffstat (limited to 'smoketest/CppunitTest_smoketest.mk')
-rw-r--r--smoketest/CppunitTest_smoketest.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index 0fad8011de06..3915df548936 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: