From 6d8d16b3761eaa24c9c754dd0f2cc1a70de8fad0 Mon Sep 17 00:00:00 2001 From: Dwayne Boone Date: Fri, 2 Oct 2009 09:35:28 -0230 Subject: C++Builder 2010 support --- scripts/IceGridAdmin.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'scripts/IceGridAdmin.py') diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index 9b11b3dd94a..3fe6ef8d21e 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -70,7 +70,11 @@ def getDefaultLocatorProperty(): def startIceGridRegistry(testdir, dynamicRegistration = False): - iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") + iceGrid = "" + if TestUtil.isNoServices(): + iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") + else: + iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") command = ' --nowarn ' + registryOptions if dynamicRegistration: @@ -127,7 +131,11 @@ def shutdownIceGridRegistry(procs): def startIceGridNode(testdir): - iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridnode") + iceGrid = "" + if TestUtil.isNoServices(): + iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridnode") + else: + iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridnode") dataDir = os.path.join(testdir, "db", "node") if not os.path.exists(dataDir): @@ -162,7 +170,11 @@ def startIceGridNode(testdir): def iceGridAdmin(cmd, ignoreFailure = False): - iceGridAdmin = os.path.join(TestUtil.getCppBinDir(), "icegridadmin") + iceGridAdmin = "" + if TestUtil.isNoServices(): + iceGridAdmin = os.path.join(TestUtil.getServiceDir(), "icegridadmin") + else: + iceGridAdmin = os.path.join(TestUtil.getCppBinDir(), "icegridadmin") user = r"admin1" if cmd == "registry shutdown": -- cgit v1.2.3