diff options
| author | Jose <jose@zeroc.com> | 2016-09-28 18:32:17 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-28 18:32:17 +0200 |
| commit | 1b2e197b5f7827e388a5f0f36e3981adc0a6a974 (patch) | |
| tree | 113e6fbfcf961868f41bba8bc52415e2cf113a4a | |
| parent | Fixed to use long instead of long long on Arm64 (diff) | |
| download | ice-1b2e197b5f7827e388a5f0f36e3981adc0a6a974.tar.bz2 ice-1b2e197b5f7827e388a5f0f36e3981adc0a6a974.tar.xz ice-1b2e197b5f7827e388a5f0f36e3981adc0a6a974.zip | |
Python Slice/ test fixes for Windowsv3.6.3-rc0
| -rwxr-xr-x | python/test/Slice/import/run.py | 2 | ||||
| -rw-r--r-- | python/test/Slice/unicodePaths/run.py | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/python/test/Slice/import/run.py b/python/test/Slice/import/run.py index a5bec140690..f57a343fc7d 100755 --- a/python/test/Slice/import/run.py +++ b/python/test/Slice/import/run.py @@ -34,7 +34,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.exe") + 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/python/test/Slice/unicodePaths/run.py b/python/test/Slice/unicodePaths/run.py index 26e03e7beff..a59059e6c9a 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.exe") + slice2py = sys.executable + " " + os.path.join(pythonHome, "Scripts", "slice2py-script.py") elif os.path.isfile(os.path.join(TestUtil.getCppBinDir(), "slice2py")): slice2py = os.path.join(TestUtil.getCppBinDir(), "slice2py") else: @@ -58,14 +58,6 @@ else: sys.stdout.write("testing Slice compiler and unicode file paths... ") sys.stdout.flush() -tests = [ - ("cpp", ["Test.cpp", "Test.h", "TestI.cpp", "TestI.h"], "--impl"), - ("cs", ["Test.cs", "TestI.cs"], "--impl"), - ("html", ["index.html"], ""), - ("java", ["Test/Point.java", "Test/CanvasI.java"], "--impl"), - ("js", ["Test.js"], ""), - ("objc", ["Test.mm"], ""), - ("php", ["Test.php"], "")] # # Write config |