diff options
| author | Jose <jose@zeroc.com> | 2016-09-26 12:25:09 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-26 12:25:09 +0200 |
| commit | a7992b0d1de5540938db4c4e0def13cc0426b76d (patch) | |
| tree | 1615c0cf21b47c7d5b1e05ce6b573c7ec032b008 | |
| parent | Removed unnecessary versions (diff) | |
| download | ice-a7992b0d1de5540938db4c4e0def13cc0426b76d.tar.bz2 ice-a7992b0d1de5540938db4c4e0def13cc0426b76d.tar.xz ice-a7992b0d1de5540938db4c4e0def13cc0426b76d.zip | |
Support slice2py install with zeroc-ice-compilers
| -rwxr-xr-x | python/test/Slice/import/run.py | 2 | ||||
| -rw-r--r-- | python/test/Slice/unicodePaths/run.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python/test/Slice/import/run.py b/python/test/Slice/import/run.py index 1b966d25e68..a5bec140690 100755 --- a/python/test/Slice/import/run.py +++ b/python/test/Slice/import/run.py @@ -35,7 +35,7 @@ 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.isYocto(): + elif os.path.isfile(os.path.join(TestUtil.getCppBinDir(), "slice2py")): slice2py = os.path.join(TestUtil.getCppBinDir(), "slice2py") else: import slice2py diff --git a/python/test/Slice/unicodePaths/run.py b/python/test/Slice/unicodePaths/run.py index c8b3cebddb9..26e03e7beff 100644 --- a/python/test/Slice/unicodePaths/run.py +++ b/python/test/Slice/unicodePaths/run.py @@ -45,7 +45,7 @@ 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.isYocto(): + elif os.path.isfile(os.path.join(TestUtil.getCppBinDir(), "slice2py")): slice2py = os.path.join(TestUtil.getCppBinDir(), "slice2py") else: import slice2py |