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/IceStormUtil.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts/IceStormUtil.py') 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) -- cgit v1.2.3