summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/update/run.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-06-21 12:40:26 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-06-21 12:40:26 +0000
commit91b10476449de133a15743272be8c5fab8010c7f (patch)
tree5c721ee19d9d3a8aa228cc9466412a1edd978446 /cpp/test/IceGrid/update/run.py
parentFix (diff)
downloadice-91b10476449de133a15743272be8c5fab8010c7f.tar.bz2
ice-91b10476449de133a15743272be8c5fab8010c7f.tar.xz
ice-91b10476449de133a15743272be8c5fab8010c7f.zip
Fixes
Diffstat (limited to 'cpp/test/IceGrid/update/run.py')
-rwxr-xr-xcpp/test/IceGrid/update/run.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py
index 6f94ef3559b..1319b654aeb 100755
--- a/cpp/test/IceGrid/update/run.py
+++ b/cpp/test/IceGrid/update/run.py
@@ -30,12 +30,17 @@ client = os.path.join(testdir, "client")
# invokes on the locator it's also considered to be a client.
#
additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12345\" " + \
- "--Ice.PrintAdapterReady=0 --Ice.PrintProcessId=0"
+ "--Ice.PrintAdapterReady=0 --Ice.PrintProcessId=0 --IceDir=\"" + toplevel + "\" --TestDir=\"" + testdir + "\""
IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12345", testdir)
iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
+node1Dir = os.path.join(testdir, "db", "node-1")
+if not os.path.exists(node1Dir):
+ os.mkdir(node1Dir)
+IceGridAdmin.cleanServerDir(node1Dir);
+
print "starting client...",
clientPipe = os.popen(client + TestUtil.clientServerOptions + additionalOptions + " 2>&1")
print "ok"