diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-11-16 11:31:15 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-11-16 11:31:15 -0330 |
| commit | 0be6a805fef10d47936f768e00176a55806be7b1 (patch) | |
| tree | acc48fd13940bb7ff23472cbd4da497b51b39a64 /scripts/IceGridAdmin.py | |
| parent | 4026 - Add config-in-registry support to IceServiceInstall (diff) | |
| download | ice-0be6a805fef10d47936f768e00176a55806be7b1.tar.bz2 ice-0be6a805fef10d47936f768e00176a55806be7b1.tar.xz ice-0be6a805fef10d47936f768e00176a55806be7b1.zip | |
Make third party a single installer
Diffstat (limited to 'scripts/IceGridAdmin.py')
| -rw-r--r-- | scripts/IceGridAdmin.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index 2fe19b6826a..be2ff995541 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -71,7 +71,7 @@ def getDefaultLocatorProperty(): def startIceGridRegistry(testdir, dynamicRegistration = False): iceGrid = "" - if TestUtil.isNoServices(): + if TestUtil.isBCC2010() or TestUtil.isVC6(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") @@ -132,7 +132,7 @@ def shutdownIceGridRegistry(procs): def startIceGridNode(testdir): iceGrid = "" - if TestUtil.isNoServices(): + if TestUtil.isBCC2010() or TestUtil.isVC6(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridnode") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridnode") @@ -171,7 +171,7 @@ def startIceGridNode(testdir): def iceGridAdmin(cmd, ignoreFailure = False): iceGridAdmin = "" - if TestUtil.isNoServices(): + if TestUtil.isBCC2010() or TestUtil.isVC6(): iceGridAdmin = os.path.join(TestUtil.getServiceDir(), "icegridadmin") else: iceGridAdmin = os.path.join(TestUtil.getCppBinDir(), "icegridadmin") |