[PATCH] Another try to fix python unit test on MSVC

[Michael Meeks (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4303

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/4303/1

Another try to fix python unit test on MSVC

Change-Id: I66734830ef228b6928b24194f278632fa9f2c70c
---
M solenv/gbuild/PythonTest.mk
M solenv/gbuild/platform/com_MSC_class.mk
M sw/Module_sw.mk
3 files changed, 5 insertions(+), 8 deletions(-)



diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
old mode 100644
new mode 100755
index eaa8757..931af98
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -40,9 +40,9 @@
 		($(gb_PythonTest_PRECOMMAND) \
 		$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
 		$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
-		URE_BOOTSTRAP=vnd.sun.star.pathname:$(gb_DEVINSTALLROOT)/program/fundamentalrc \
-		PYTHONPATH=$(PYPATH) \
-		UserInstallation="$(call gb_Helper_make_url,$(OUTDIR)/unittest)" \
+		URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(gb_DEVINSTALLROOT)/program/fundamental) \
+		PYTHONPATH="$(PYPATH)" \
+		UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \
 		TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \
 		$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_PythonTest_COMMAND) \
 			$(MODULES) \
@@ -55,7 +55,7 @@
 
 # always use udkapi and URE services
 define gb_PythonTest_PythonTest
-$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python:$(gb_DEVINSTALLROOT)/program
+$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/program
 $(call gb_PythonTest_get_target,$(1)) : MODULES :=
 
 $(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1))))
@@ -70,7 +70,7 @@
 #
 # gb_PythonTest_add_modules directory module(s)
 define gb_PythonTest_add_modules
-$(call gb_PythonTest_get_target,$(1)) : PYPATH := $$(PYPATH):$(2)
+$(call gb_PythonTest_get_target,$(1)) : PYPATH := $$(PYPATH)$$(gb_CLASSPATHSEP)$(2)
 $(call gb_PythonTest_get_target,$(1)) : MODULES += $(3)
 
 endef
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 478a89b..0d050dd 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -452,7 +452,6 @@
 
 # PythonTest class
 
-#TODO:
 gb_PythonTest_PRECOMMAND :=
 
 # SrsPartTarget class
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
old mode 100644
new mode 100755
index 202c67c..7048d8e
--- 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/4303
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66734830ef228b6928b24194f278632fa9f2c70c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Meeks <michael.meeks at suse.com>