summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-09-29 19:12:55 +0200
committerJose <jose@zeroc.com>2016-09-29 19:12:55 +0200
commit6a263b11c2ffdca90bb174e294bf9e513bbd71f9 (patch)
treed38a39752ec1ae46aff030945613c1ca3d87c8b8
parentUpdate Java Gradle and Android tools versions (diff)
downloadice-6a263b11c2ffdca90bb174e294bf9e513bbd71f9.tar.bz2
ice-6a263b11c2ffdca90bb174e294bf9e513bbd71f9.tar.xz
ice-6a263b11c2ffdca90bb174e294bf9e513bbd71f9.zip
Ruby/Python unicodePaths test fixes for Windows
- Ruby on Windows is build with MINGW which does not support Windows UNICODE APIs required for this to work. - Use slice2py.exe with PIP install
-rw-r--r--python/test/Slice/unicodePaths/run.py2
-rw-r--r--ruby/test/Slice/unicodePaths/run.py7
2 files changed, 7 insertions, 2 deletions
diff --git a/python/test/Slice/unicodePaths/run.py b/python/test/Slice/unicodePaths/run.py
index 23ee198b748..c6d83009cac 100644
--- a/python/test/Slice/unicodePaths/run.py
+++ b/python/test/Slice/unicodePaths/run.py
@@ -44,7 +44,7 @@ if os.environ.get("USE_BIN_DIST", "no") == "yes":
slice2py = sys.executable + " /usr/local/bin/slice2py"
elif TestUtil.isWin32():
pythonHome = os.path.dirname(sys.executable)
- slice2py = sys.executable + " " + os.path.join(pythonHome, "Scripts", "slice2py-script.py")
+ slice2py = os.path.join(pythonHome, "Scripts", "slice2py.exe")
elif os.path.isfile(os.path.join(TestUtil.getCppBinDir(), "slice2py")):
slice2py = os.path.join(TestUtil.getCppBinDir(), "slice2py")
else:
diff --git a/ruby/test/Slice/unicodePaths/run.py b/ruby/test/Slice/unicodePaths/run.py
index 9805c4ee2e2..3ff0e2838c5 100644
--- a/ruby/test/Slice/unicodePaths/run.py
+++ b/ruby/test/Slice/unicodePaths/run.py
@@ -33,10 +33,15 @@ if TestUtil.isAIX() or TestUtil.isLinux():
print("Skipping test")
sys.exit(0)
+if TestUtil.isWin32():
+ print("Ruby on Windows is build with MINGW and it doesn't support Windows UNICODE APIs")
+ print("Skipping test")
+ sys.exit(0)
+
if sys.version_info[0] == 2 and TestUtil.isWin32():
print("To run this test on Windows you need to be using Python 3.x")
print("Python 2.x subprocess module doesn't support unicode on Windows")
- print("Skipping tes")
+ print("Skipping test")
sys.exit(0)
if os.environ.get("USE_BIN_DIST", "no") == "yes":