diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-10-02 09:35:28 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-10-02 09:35:28 -0230 |
| commit | 6d8d16b3761eaa24c9c754dd0f2cc1a70de8fad0 (patch) | |
| tree | ff37056717cff166bc705112f54e98074f8d1f40 /scripts/IceStormUtil.py | |
| parent | 3772. Recovering from Glacier2 / Ice router session failure. (diff) | |
| download | ice-6d8d16b3761eaa24c9c754dd0f2cc1a70de8fad0.tar.bz2 ice-6d8d16b3761eaa24c9c754dd0f2cc1a70de8fad0.tar.xz ice-6d8d16b3761eaa24c9c754dd0f2cc1a70de8fad0.zip | |
C++Builder 2010 support
Diffstat (limited to 'scripts/IceStormUtil.py')
| -rw-r--r-- | scripts/IceStormUtil.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index a481a111372..ef1b1c03efe 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -35,8 +35,12 @@ class IceStormUtil(object): self.toplevel = toplevel self.testdir = testdir self.iceBox = TestUtil.getIceBox() - self.iceBoxAdmin = os.path.join(TestUtil.getCppBinDir(), "iceboxadmin") - self.iceStormAdmin = os.path.join(TestUtil.getCppBinDir(), "icestormadmin") + if TestUtil.isNoServices(): + self.iceBoxAdmin = os.path.join(TestUtil.getServiceDir(), "iceboxadmin") + self.iceStormAdmin = os.path.join(TestUtil.getServiceDir(), "icestormadmin") + else: + self.iceBoxAdmin = os.path.join(TestUtil.getCppBinDir(), "iceboxadmin") + self.iceStormAdmin = os.path.join(TestUtil.getCppBinDir(), "icestormadmin") def runIceBoxAdmin(self, endpts, command): proc = TestUtil.startClient(self.iceBoxAdmin, endpts + " " + command, echo = False) |