diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-09-21 14:25:39 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:34 +0200 |
commit | 2c092f352e8cd8e8013ad9ec01add73ddcfc427f (patch) | |
tree | b3a4d4802ec56bb7f5c769e93295dbd359799002 | |
parent | a3699e6a321093afd92492d13a045a81e2185afe (diff) |
make the PythonTest run on WNT
- fix the PATH
- file url needs to start with file:///X:/ (three slashes, literal :)
Change-Id: I0d16d1e946fd06ba5523961c23c3b46872c0c050
-rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 | ||||
-rw-r--r-- | sw/Module_sw.mk | 2 | ||||
-rw-r--r-- | unotest/source/python/org/libreoffice/unotest.py | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index beb82661d716..2269d33ddd9e 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -439,7 +439,7 @@ endef # PythonTest class -gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(gb_DEVINSTALLROOT)/URE/bin:$(gb_DEVINSTALLROOT)/program:$(OUTDIR)/bin +gb_PythonTest_PRECOMMAND := $(gb_Helper_set_ld_path) # SrsPartTarget class diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 202c67c4fc35..7048d8ec6ff1 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -72,11 +72,9 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ 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: diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py index 883d3a40e47e..3da77ffdbd3e 100644 --- a/unotest/source/python/org/libreoffice/unotest.py +++ b/unotest/source/python/org/libreoffice/unotest.py @@ -193,7 +193,11 @@ class UnoInProcess: props = [("Hidden", True), ("ReadOnly", False), ("AsTemplate", True)] loadProps = tuple([mkPropertyValue(name, value) for (name, value) in props]) path = os.getenv("TDOC") - url = "file://" + quote(path) + "/" + quote(file) + if os.name == "nt": + # do not quote drive letter - it must be "X:" + url = "file:///" + path + "/" + quote(file) + else: + url = "file://" + quote(path) + "/" + quote(file) self.xDoc = desktop.loadComponentFromURL(url, "_blank", 0, loadProps) assert(self.xDoc) return self.xDoc |