diff options
| -rw-r--r-- | solenv/gbuild/PythonTest.mk | 9 | ||||
| -rw-r--r-- | sw/Module_sw.mk | 3 |
2 files changed, 5 insertions, 7 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 diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index b1dbe2f473d0..fedb44a3dabd 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -70,13 +70,10 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ )) endif -# TODO: FixMe restrict to system python ifneq ($(DISABLE_PYTHON),TRUE) -ifeq ($(SYSTEM_PYTHON),YES) $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ PythonTest_sw_unoapi \ )) endif -endif # vim: set noet sw=4 ts=4: |