From 13940a8eac7059c0eb7f7cd243fa0b45582a4fad Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 16 Aug 2013 01:28:24 +0300 Subject: Use a proper folder as "user installation" when sandboxed A sandboxed soffice process (runnin smoketest) has no access to workdir. Change-Id: I62ef94282df37ea710735f1305c1d95dd2b0a304 --- smoketest/CppunitTest_smoketest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'smoketest') diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index bd4becb7942a..3ab4ce54cea5 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -32,9 +32,15 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\ $(eval $(call gb_CppunitTest_use_ure,smoketest)) +ifeq ($(ENABLE_MACOSX_SANDBOX),YES) +userinstallation=$(shell $(gb_DEVINSTALLROOT)/MacOS/soffice --nstemporarydirectory) +else +userinstallation=$(WORKDIR)/CustomTarget/smoketest +endif + $(eval $(call gb_CppunitTest_add_arguments,smoketest,\ -env:arg-soffice=$(gb_JunitTest_SOFFICEARG) \ - -env:arg-user=$(WORKDIR)/CustomTarget/smoketest \ + -env:arg-user=$(userinstallation) \ -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 \ )) -- cgit