[Libreoffice-commits] core.git: solenv/gbuild sw/Module_sw.mk

[Michael Stahl]

 solenv/gbuild/PythonTest.mk |    9 +++++----
 sw/Module_sw.mk             |    3 ---
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit c576617408f6432955ae3fda662b23d66b34f43b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Apr 18 23:38:17 2013 +0200

    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 at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index cb018b1..199ffcc 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 b1dbe2f..fedb44a 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: