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 /cpp/test/IceGrid/fileLock/run.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 'cpp/test/IceGrid/fileLock/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/fileLock/run.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cpp/test/IceGrid/fileLock/run.py b/cpp/test/IceGrid/fileLock/run.py index 7c4b863d8a6..27e4be164a5 100755 --- a/cpp/test/IceGrid/fileLock/run.py +++ b/cpp/test/IceGrid/fileLock/run.py @@ -26,12 +26,7 @@ testdir = os.getcwd(); IceGridAdmin.nreplicas = 0 def runIceGridRegistry(): - iceGrid = "" - if TestUtil.isVC90(): - iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") - else: - iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") - + iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") command = ' --nowarn ' + IceGridAdmin.registryOptions dataDir = os.path.join(testdir, "db", "registry") |