diff options
Diffstat (limited to 'scripts/IceGridAdmin.py')
| -rw-r--r-- | scripts/IceGridAdmin.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index 27b504d484f..2d11c3c5356 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -70,11 +70,7 @@ def getDefaultLocatorProperty(): def startIceGridRegistry(testdir, dynamicRegistration = False): - iceGrid = "" - if TestUtil.isVC90(): - iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") - else: - iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") + iceGrid = TestUtil.getIceGridRegistry() command = ' --nowarn ' + registryOptions if dynamicRegistration: @@ -155,12 +151,7 @@ def iceGridNodePropertiesOverride(): def startIceGridNode(testdir): - iceGrid = "" - if TestUtil.isVC90(): - iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridnode") - else: - iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridnode") - + iceGrid = TestUtil.getIceGridNode() dataDir = os.path.join(testdir, "db", "node") if not os.path.exists(dataDir): os.mkdir(dataDir) |