diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-20 20:18:40 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-20 23:39:32 +0200 |
| commit | 6d6bb989d1ba9af26518a110728f479d099b4562 (patch) | |
| tree | 8976c9e601853138a658581b82f2993c93b6e5e8 /solenv | |
| parent | 0a354129838758e2b34078b3c73b3551ce182a2b (diff) | |
gbuild: PythonTest: try to make it more portable
Mac OS X is not tested though.
Change-Id: I143e20e91378b5c0546c0435dda756682d7773e7
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/PythonTest.mk | 10 | ||||
| -rwxr-xr-x | solenv/gbuild/platform/com_MSC_class.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 5 |
5 files changed, 17 insertions, 5 deletions
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index bbf787778e0a..141dc2dc6686 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -10,12 +10,14 @@ # PythonTest class ifeq ($(SYSTEM_PYTHON),NO) -gb_Python_EXE := /bin/sh $(DEVINSTALLDIR)/opt/program/python +gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE) +gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB) else -gb_Python_EXE := $(PYTHON_FOR_BUILD) +gb_PythonTest_EXECUTABLE := $(PYTHON_FOR_BUILD) +gb_PythonTest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD) endif -gb_PythonTest_COMMAND := $(gb_Python_EXE) -m unittest +gb_PythonTest_COMMAND := $(gb_PythonTest_EXECUTABLE) -m unittest .PHONY : $(call gb_PythonTest_get_clean_target,%) $(call gb_PythonTest_get_clean_target,%) : @@ -43,7 +45,7 @@ $(call gb_PythonTest_get_target,%) : > $@.log 2>&1 \ || (cat $@.log && $(UNIT_FAILED_MSG) \ $(if $(value gb_CppunitTest_postprocess), \ - && $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core)) \ + && $(call gb_CppunitTest_postprocess,$(gb_PythonTest_EXECUTABLE_GDB),$@.core)) \ && false)))) # always use udkapi and URE services diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index d56801f1ca45..36f973dd988b 100755 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -624,5 +624,6 @@ gb_Pyuno_PROGRAMDIRNAME := program # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload" +gb_Python_INSTALLED_EXECUTABLE := $(DEVINSTALLDIR)/opt/program/python.exe # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 5ce425cfa5a4..c7c093d746b5 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -403,6 +403,9 @@ endef # Python gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib +gb_Python_INSTALLED_EXECUTABLE := $(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython +# this is passed to gdb as executable when running tests +gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE) # Pyuno class diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 965b2ef22718..8ec01c50e773 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -435,6 +435,9 @@ gb_Pyuno_PROGRAMDIRNAME := program # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload +gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(DEVINSTALLDIR)/opt/program/python +# this is passed to gdb as executable when running tests +gb_Python_INSTALLED_EXECUTABLE_GDB := $(DEVINSTALLDIR)/opt/program/python.bin include $(GBUILDDIR)/platform/com_GCC_class.mk diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index ab54e27e2e14..e2784d1876d1 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -433,7 +433,10 @@ gb_UIMenubarTarget_UIMenubarTarget_platform := gb_Pyuno_PROGRAMDIRNAME := program # Python -gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload +gb_Python_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload +gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(DEVINSTALLDIR)/opt/program/python +# this is passed to gdb as executable when running tests +gb_Python_INSTALLED_EXECUTABLE_GDB := $(DEVINSTALLDIR)/opt/program/python.bin include $(GBUILDDIR)/platform/com_GCC_class.mk |