summaryrefslogtreecommitdiff
path: root/smoketest
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-07-12 12:50:49 +0200
committerDavid Tardon <dtardon@redhat.com>2013-07-12 12:52:55 +0200
commite352abc2e60abd21e383ebf971e545ca510ac4ed (patch)
tree822158c9d023ce2da9b11952f299cf70c21919c3 /smoketest
parent28a4496c76acdab6cb851387e78366bb611f130f (diff)
allow to run smoketest in arbitrary installation
Just set OOO_TEST_SOFFICE=path:/path/to/installation/program/soffice . Change-Id: Ic772a56328253f608a62a21923a74198fa29a136
Diffstat (limited to 'smoketest')
-rw-r--r--smoketest/CppunitTest_smoketest.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index 3915df548936..bd4becb7942a 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -30,16 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
unotest \
))
-ifeq ($(OS),MACOSX)
-smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/MacOS/soffice
-else
-smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/program/soffice
-endif
-
$(eval $(call gb_CppunitTest_use_ure,smoketest))
$(eval $(call gb_CppunitTest_add_arguments,smoketest,\
- -env:arg-soffice=$(smoketest_SOFFICE) \
+ -env:arg-soffice=$(gb_JunitTest_SOFFICEARG) \
-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=$(WORKDIR)/Zip/smoketestdoc.sxw \