diff options
| author | Jose <jose@zeroc.com> | 2016-03-23 17:57:49 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-23 17:57:49 +0100 |
| commit | 60d0deaf7d630f0d510cb472676ee7e4ce539ed2 (patch) | |
| tree | d6a846ca844cbfda7f91cbb6dc20f664c8948d07 | |
| parent | stacktrace test fixes (diff) | |
| download | ice-60d0deaf7d630f0d510cb472676ee7e4ce539ed2.tar.bz2 ice-60d0deaf7d630f0d510cb472676ee7e4ce539ed2.tar.xz ice-60d0deaf7d630f0d510cb472676ee7e4ce539ed2.zip | |
Fix for yocto python testing
| -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 00abd7dbd61..184c1838520 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(): + elif TestUtil.isDebian() or 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(): + if TestUtil.isDebian() or 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") |