[PATCH] fix python unit test invocation for MSVC

[David Ostrovsky (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3728

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/3728/1

fix python unit test invocation for MSVC

Change-Id: Ib6836e7609e0c268f91b04a8ca8618a15dfdae82
---
M solenv/gbuild/platform/com_MSC_class.mk
M sw/Module_sw.mk
2 files changed, 4 insertions(+), 8 deletions(-)



diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
old mode 100644
new mode 100755
index 83d5d45..a9a2e81
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -453,11 +453,6 @@
 
 endef
 
-# PythonTest class
-
-#TODO:
-gb_PythonTest_PRECOMMAND :=
-
 # SrsPartTarget class
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -598,6 +593,9 @@
 
 # Python
 gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
-gb_Python_INSTALLED_EXECUTABLE := $(gb_DEVINSTALLROOT)/program/python.exe
+
+gb_Python_INSTALLED_EXECUTABLE := "$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/bin/python.exe"
+
+gb_PythonTest_PRECOMMAND := $(gb_Python_PRECOMMAND)
 
 # vim: set noet sw=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 202c67c..7048d8e 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -72,11 +72,9 @@
 endif
 
 ifneq ($(DISABLE_PYTHON),TRUE)
-ifneq ($(OS),WNT)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
 	PythonTest_sw_python \
 ))
-endif
 endif
 
 # vim: set noet sw=4 ts=4:

-- 
To view, visit https://gerrit.libreoffice.org/3728
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6836e7609e0c268f91b04a8ca8618a15dfdae82
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky <David.Ostrovsky at gmx.de>