diff options
| author | Jose <jose@zeroc.com> | 2016-09-17 00:28:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-17 00:28:00 +0200 |
| commit | 47c3b5d2b03d3286cba2a3b4890e57fdd6135132 (patch) | |
| tree | 40e05ffec6df92a5b88fdb675d775580f41547c1 /python/test/Slice/import/run.py | |
| parent | 3.6.3 version fixes (diff) | |
| download | ice-47c3b5d2b03d3286cba2a3b4890e57fdd6135132.tar.bz2 ice-47c3b5d2b03d3286cba2a3b4890e57fdd6135132.tar.xz ice-47c3b5d2b03d3286cba2a3b4890e57fdd6135132.zip | |
Fix ICE-4787 - slice compilers and unicode paths
Diffstat (limited to 'python/test/Slice/import/run.py')
| -rwxr-xr-x | python/test/Slice/import/run.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/test/Slice/import/run.py b/python/test/Slice/import/run.py index 184c1838520..1b966d25e68 100755 --- a/python/test/Slice/import/run.py +++ b/python/test/Slice/import/run.py @@ -35,13 +35,13 @@ if os.environ.get("USE_BIN_DIST", "no") == "yes": elif TestUtil.isWin32(): pythonHome = os.path.dirname(sys.executable) slice2py = sys.executable + " " + os.path.join(pythonHome, "Scripts", "slice2py.exe") - elif TestUtil.isDebian() or TestUtil.isYocto(): + elif TestUtil.isYocto(): slice2py = os.path.join(TestUtil.getCppBinDir(), "slice2py") else: import slice2py slice2py = sys.executable + " " + os.path.normpath(os.path.join(slice2py.__file__, "..", "..", "..", "..", "bin", "slice2py")) else: - if TestUtil.isDebian() or TestUtil.isYocto(): + if TestUtil.isYocto(): slice2py = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "..", "..", "..", "cpp", "bin", "slice2py") else: slice2py = sys.executable + " " + os.path.join(path[0], "python", "config", "s2py.py") |