1 files changed, 15 insertions, 19 deletions
diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py
index 72d34fe748b..38284add9c2 100755
--- a/cpp/test/IceGrid/update/run.py
+++ b/cpp/test/IceGrid/update/run.py
@@ -10,37 +10,33 @@
 
 import os, sys
 
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    toplevel = os.path.normpath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
-        break
-else:
+path = [ ".", "..", "../..", "../../..", "../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
     raise "can't find toplevel directory!"
-
-sys.path.append(os.path.join(toplevel, "config"))
-import TestUtil
-TestUtil.processCmdLine()
-import IceGridAdmin
+sys.path.append(os.path.join(path[0]))
+from scripts import *
 
 name = os.path.join("IceGrid", "update")
-testdir = os.path.dirname(os.path.abspath(__file__))
 
-node1Dir = os.path.join(testdir, "db", "node-1")
+node1Dir = os.path.join(os.getcwd(), "db", "node-1")
 if not os.path.exists(node1Dir):
     os.mkdir(node1Dir)
 else:
     IceGridAdmin.cleanDbDir(node1Dir)
 
-node2Dir = os.path.join(testdir, "db", "node-2")
+node2Dir = os.path.join(os.getcwd(), "db", "node-2")
 if not os.path.exists(node2Dir):
     os.mkdir(node2Dir)
 else:
     IceGridAdmin.cleanDbDir(node2Dir)
 
-nodeOverrideOptions = "--IceBinDir=\"" + TestUtil.getCppBinDir() + "\" --TestDir=\"" + testdir + "\"" + \
-                      ' --NodePropertiesOverride="' + \
-                      TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "") + \
-                      ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0' + '"'
+nodeOverrideOptions = '--IceBinDir="%s" --TestDir="%s" --NodePropertiesOverride="%s Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"' % (
+    TestUtil.getCppBinDir(),
+    os.getcwd(),
+    TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", ""))
 
-IceGridAdmin.iceGridTest(testdir, name, "", nodeOverrideOptions)
-sys.exit(0)
+IceGridAdmin.iceGridTest("", nodeOverrideOptions)