diff options
| author | Jose <jose@zeroc.com> | 2016-03-17 17:16:28 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-17 17:16:28 +0100 |
| commit | 3f2e573417fa959a242ef9c92bab25e4a4575a2c (patch) | |
| tree | 98ce3b1d7dea61b73bb0bca369a678afed786865 /python | |
| parent | Windows IceSSL/configuration test fix (diff) | |
| download | ice-3f2e573417fa959a242ef9c92bab25e4a4575a2c.tar.bz2 ice-3f2e573417fa959a242ef9c92bab25e4a4575a2c.tar.xz ice-3f2e573417fa959a242ef9c92bab25e4a4575a2c.zip | |
python Slice/import test fixes for Debian binary python package
Diffstat (limited to 'python')
| -rwxr-xr-x | python/test/Slice/import/run.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/python/test/Slice/import/run.py b/python/test/Slice/import/run.py index 538d4ae40c1..00abd7dbd61 100755 --- a/python/test/Slice/import/run.py +++ b/python/test/Slice/import/run.py @@ -31,19 +31,24 @@ if os.path.exists(os.path.join(testdir, "Test")): if os.environ.get("USE_BIN_DIST", "no") == "yes": if TestUtil.isDarwin(): - slice2py = "/usr/local/bin/slice2py" + slice2py = sys.executable + " /usr/local/bin/slice2py" elif TestUtil.isWin32(): pythonHome = os.path.dirname(sys.executable) - slice2py = os.path.join(pythonHome, "Scripts", "slice2py.exe") + slice2py = sys.executable + " " + os.path.join(pythonHome, "Scripts", "slice2py.exe") + elif TestUtil.isDebian(): + slice2py = os.path.join(TestUtil.getCppBinDir(), "slice2py") else: import slice2py - slice2py = os.path.normpath(os.path.join(slice2py.__file__, '..', '..', '..', '..', 'bin', 'slice2py')) + slice2py = sys.executable + " " + os.path.normpath(os.path.join(slice2py.__file__, "..", "..", "..", "..", "bin", "slice2py")) else: - slice2py = os.path.join(path[0], "python", "config", "s2py.py") + if TestUtil.isDebian(): + 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") -s2p = TestUtil.spawn(sys.executable + " " + slice2py + " Test1.ice") +s2p = TestUtil.spawn(slice2py + " Test1.ice") s2p.waitTestSuccess() -s2p = TestUtil.spawn(sys.executable + " " + slice2py + " Test2.ice") +s2p = TestUtil.spawn(slice2py + " Test2.ice") s2p.waitTestSuccess() sys.stdout.write("starting client... ") |