diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2013-06-16 11:32:39 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-16 12:03:02 +0100 |
| commit | 2efac6b4d53821ef9167f3e04f205e1f6ae28638 (patch) | |
| tree | 74bd9daea913bb35a200aa2e5741eee20514867b /solenv | |
| parent | be53bec4fa8e6d08ceac0496585bbf64f69b4a19 (diff) | |
Another try to fix python unit test on MSVC
Change-Id: I66734830ef228b6928b24194f278632fa9f2c70c
Diffstat (limited to 'solenv')
| -rwxr-xr-x[-rw-r--r--] | solenv/gbuild/PythonTest.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index eaa87574cdf8..931af98a7e70 100644..100755 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -40,9 +40,9 @@ $(call gb_PythonTest_get_target,%) : ($(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 @@ $(call gb_PythonTest_get_target,%) : # 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 @@ endef # # 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 478a89b61337..0d050dd1b1f6 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -452,7 +452,6 @@ endef # PythonTest class -#TODO: gb_PythonTest_PRECOMMAND := # SrsPartTarget class |