diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-18 23:38:17 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-19 04:54:27 +0000 |
| commit | c576617408f6432955ae3fda662b23d66b34f43b (patch) | |
| tree | 0dd2da10db88f5b331e79fac82c093d76b958593 /solenv | |
| parent | a210575baa5bc72dc0392eeb20b2da58b6cf14ae (diff) | |
run PythonTests with internal python too
... and use PYTHON_FOR_BUILD in the system python case.
Change-Id: If3c3305ab4f613642bea9b775e4c7a602f5a476c
TODO: needs testing on more platforms
Reviewed-on: https://gerrit.libreoffice.org/3471
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/PythonTest.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index cb018b1a3b64..199ffcc0fe1f 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -9,10 +9,11 @@ # PythonTest class -# TODO: FixMe problem with internal python: -# Fatal Python error: Py_Initialize: Unable to get the locale encoding -#gb_Python_EXE := $(call gb_Executable_get_command,python) -gb_Python_EXE := python3 +ifeq ($(SYSTEM_PYTHON),NO) +gb_Python_EXE := $(OUTDIR)/installation/opt/program/python.bin +else +gb_Python_EXE := $(PYTHON_FOR_BUILD) +endif gb_PythonTest_COMMAND := $(gb_Python_EXE) -m unittest |