diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-10-09 13:31:19 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-10-09 13:31:19 -0230 |
| commit | cec775ffebd3c2bb6c395d5c9f1e4106f3d72d09 (patch) | |
| tree | 385630603c4fbb9b22c537812314c6deaf89925c /scripts/IceStormUtil.py | |
| parent | Fix Ruby Mingw install to install ruby x64 in ruby/x64 directory (diff) | |
| download | ice-cec775ffebd3c2bb6c395d5c9f1e4106f3d72d09.tar.bz2 ice-cec775ffebd3c2bb6c395d5c9f1e4106f3d72d09.tar.xz ice-cec775ffebd3c2bb6c395d5c9f1e4106f3d72d09.zip | |
ICE-5441 tests hang on Windows if executable not present
Diffstat (limited to 'scripts/IceStormUtil.py')
| -rw-r--r-- | scripts/IceStormUtil.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index 9ddb0ecbea5..a08f4c3bca2 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -35,12 +35,8 @@ class IceStormUtil(object): self.toplevel = toplevel self.testdir = testdir self.iceBox = TestUtil.getIceBox() - if TestUtil.isVC90(): - 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") + 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) |