diff options
| author | Jose <jose@zeroc.com> | 2016-09-20 22:44:23 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-20 22:44:23 +0200 |
| commit | 2710536374cd737138c7d56f1739d14120c40e99 (patch) | |
| tree | a4095352c1ca046368193958bcb9731ac2afb5d4 /ruby/test | |
| parent | Fixed generated include when source Slice file is in a path with symlink (diff) | |
| download | ice-2710536374cd737138c7d56f1739d14120c40e99.tar.bz2 ice-2710536374cd737138c7d56f1739d14120c40e99.tar.xz ice-2710536374cd737138c7d56f1739d14120c40e99.zip | |
Fix ruby unicodePaths test to locate slice2rb
With gem distributions we use slice2rb from system PATH
Diffstat (limited to 'ruby/test')
| -rw-r--r-- | ruby/test/Slice/unicodePaths/run.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ruby/test/Slice/unicodePaths/run.py b/ruby/test/Slice/unicodePaths/run.py index 3cd71a25397..fa22d24e06f 100644 --- a/ruby/test/Slice/unicodePaths/run.py +++ b/ruby/test/Slice/unicodePaths/run.py @@ -40,16 +40,10 @@ if sys.version_info[0] == 2 and TestUtil.isWin32(): sys.exit(0) if os.environ.get("USE_BIN_DIST", "no") == "yes": - if TestUtil.isDarwin(): - slice2rb = sys.executable + " /usr/local/bin/slice2rb" - elif TestUtil.isWin32(): - pythonHome = os.path.dirname(sys.executable) - slice2rb = sys.executable + " " + os.path.join(pythonHome, "Scripts", "slice2rb.exe") - elif TestUtil.isYocto(): + if TestUtil.isYocto(): slice2rb = os.path.join(TestUtil.getCppBinDir(), "slice2rb") else: - import slice2rb - slice2rb = sys.executable + " " + os.path.normpath(os.path.join(slice2rb.__file__, "..", "..", "..", "..", "bin", "slice2rb")) + slice2rb = "slice2rb" else: if TestUtil.isYocto(): slice2rb = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "..", "..", "..", "cpp", "bin", "slice2rb") |