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 /solenv/gbuild/PythonTest.mk | |
| parent | Fix bnc#705982 - make animations inside SmartArt work. (diff) | |
| download | core-9b30c3e98ebb2f1c74609d93be735daf3b0bf03c.tar.gz core-9b30c3e98ebb2f1c74609d93be735daf3b0bf03c.zip | |
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 'solenv/gbuild/PythonTest.mk')
| -rw-r--r-- | solenv/gbuild/PythonTest.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index d6570f353528..63665582f28f 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -36,14 +36,10 @@ $(call gb_PythonTest_get_target,%) : $(if $(gb_CppunitTest__interactive),, \ $(if $(value gb_CppunitTest_postprocess), \ rm -fr $@.core && mkdir $@.core && cd $@.core &&)) \ - (PYTHONPATH=$(PYPATH):$(DEVINSTALLDIR)/opt/program \ + ($(gb_PythonTest_PRECOMMAND) \ + URE_BOOTSTRAP=vnd.sun.star.pathname:$(gb_DEVINSTALLROOT)/program/fundamentalrc \ + PYTHONPATH=$(PYPATH) \ UserInstallation="$(call gb_Helper_make_url,$(OUTDIR)/unittest)" \ - BRAND_BASE_DIR="$(call gb_Helper_make_url,$(OUTDIR)/unittest/install)" \ - CONFIGURATION_LAYERS="$(strip $(CONFIGURATION_LAYERS))" \ - UNO_TYPES="$(foreach item,$(UNO_TYPES),$(call gb_Helper_make_url,$(item)))" \ - UNO_SERVICES="$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))" \ - $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\ - $(dir)="$(call gb_Helper_make_url,$(gb_CppunitTest_LIBDIR))") \ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_PythonTest_COMMAND) \ $(MODULES) \ $(if $(gb_CppunitTest__interactive),, \ |