summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/replication/run.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-11-15 15:11:55 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-11-15 15:11:55 +0000
commit19dfe783b4152088804b265c5eb239e1e41d8468 (patch)
tree5915798fbaf00bcfcb119779f7e05376b61dd30c /cpp/test/IceGrid/replication/run.py
parentBug 629 (diff)
downloadice-19dfe783b4152088804b265c5eb239e1e41d8468.tar.bz2
ice-19dfe783b4152088804b265c5eb239e1e41d8468.tar.xz
ice-19dfe783b4152088804b265c5eb239e1e41d8468.zip
Fixes to use iceboxd.exe
Diffstat (limited to 'cpp/test/IceGrid/replication/run.py')
-rwxr-xr-xcpp/test/IceGrid/replication/run.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py
index d29e866a200..d1e3b222e85 100755
--- a/cpp/test/IceGrid/replication/run.py
+++ b/cpp/test/IceGrid/replication/run.py
@@ -34,9 +34,9 @@ else:
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")):
- useIceboxd = 1
+ iceBox = os.path.join(toplevel, "bin", "iceboxd")
else:
- useIceboxd = 0
+ iceBox = os.path.join(toplevel, "bin", "icebox")
#
# Add locator options for the client and server. Since the server
@@ -57,7 +57,7 @@ iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
print "registering application with icegrid...",
IceGridAdmin.addApplication(os.path.join(testdir, "application.xml"),
- "ice.dir=" + toplevel + " " + "test.dir=" + testdir);
+ "ice.dir=" + toplevel + " " + "test.dir=" + testdir + " icebox.exe=" + iceBox);
print "ok"
print "starting client...",