summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/deployer/run.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2006-01-26 15:20:42 +0000
committerBenoit Foucher <benoit@zeroc.com>2006-01-26 15:20:42 +0000
commit4b7a28bf34f8a0a0e7740cf12c54999a15a71640 (patch)
tree427d210d5824dcb518ac54024aa105dfb9dc8b36 /cpp/test/IceGrid/deployer/run.py
parentFixed bug 829 (diff)
downloadice-4b7a28bf34f8a0a0e7740cf12c54999a15a71640.tar.bz2
ice-4b7a28bf34f8a0a0e7740cf12c54999a15a71640.tar.xz
ice-4b7a28bf34f8a0a0e7740cf12c54999a15a71640.zip
Fixed test scripts to use the icebox executable matching the build
configuration of the test (debug vs. release).
Diffstat (limited to 'cpp/test/IceGrid/deployer/run.py')
-rwxr-xr-xcpp/test/IceGrid/deployer/run.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/test/IceGrid/deployer/run.py b/cpp/test/IceGrid/deployer/run.py
index ee3eba36f74..d2dfe859f21 100755
--- a/cpp/test/IceGrid/deployer/run.py
+++ b/cpp/test/IceGrid/deployer/run.py
@@ -32,10 +32,7 @@ else:
os.environ["LD_LIBRARY_PATH"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH", "")
os.environ["LD_LIBRARY_PATH_64"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH_64", "")
-if TestUtil.isWin32() and os.path.exists(os.path.join(toplevel, "bin", "iceboxd.exe")):
- iceBox = os.path.join(toplevel, "bin", "iceboxd")
-else:
- iceBox = os.path.join(toplevel, "bin", "icebox")
+iceBox = TestUtil.getIceBox(testdir)
#
# Start the client.