Kaydet (Commit) 2c092f35 authored tarafından Michael Stahl's avatar Michael Stahl

make the PythonTest run on WNT

- fix the PATH
- file url needs to start with file:///X:/ (three slashes, literal :)

Change-Id: I0d16d1e946fd06ba5523961c23c3b46872c0c050
üst a3699e6a
......@@ -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
......
......@@ -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:
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment