diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-26 13:32:08 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-26 13:40:11 +0200 |
commit | 9b30c3e98ebb2f1c74609d93be735daf3b0bf03c (patch) | |
tree | 340326f4c19d39546e213d6496776db248177487 /smoketest/CppunitTest_smoketest.mk | |
parent | d56ba7ee6f385866d82142aab568a159009ae69e (diff) |
Towards a Mac OS X PythonTest
Use URE_BOOTSTRAP instead of listing ~its content individually.
[DY]LD_LIBRARY_PATH needs to be set to all of installdir's ure and program as
well as OUTDIR, as initPoniesMode (pyuno/source/module/pyuno_module.cxx) tries
to load the OUTDIR test library. Abstracted as gb_PythonTest_PRECOMMAND.
Abstracted Mac's special LibreOffice.app/Content path as gb_DEVINSTALLROOT,
adapted a number of places accordingly.
Change-Id: I1646615c77dfab342675f84dbb83c579bf16058d
Diffstat (limited to 'smoketest/CppunitTest_smoketest.mk')
-rw-r--r-- | smoketest/CppunitTest_smoketest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index ee0d8156c791..f607c069c4c9 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -48,9 +48,9 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\ )) ifeq ($(OS),MACOSX) -smoketest_SOFFICE := path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice +smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/MacOS/soffice else -smoketest_SOFFICE := path:$(DEVINSTALLDIR)/opt/program/soffice +smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/program/soffice endif $(eval $(call gb_CppunitTest_use_ure,smoketest)) |