summaryrefslogtreecommitdiff
path: root/cpp/test/IceStorm/federation/run.py
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-11-15 14:22:59 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-11-15 14:22:59 +0000
commit27cf91cfd02c30e23a64d6317f00ac33c71eaac4 (patch)
tree0e006e131b2d16a59aec88aa6af6511f0657d41d /cpp/test/IceStorm/federation/run.py
parentBug 629 - Check whether optimized on windows to determine icebox executable (diff)
downloadice-27cf91cfd02c30e23a64d6317f00ac33c71eaac4.tar.bz2
ice-27cf91cfd02c30e23a64d6317f00ac33c71eaac4.tar.xz
ice-27cf91cfd02c30e23a64d6317f00ac33c71eaac4.zip
Bug 629 - Use correct icebox exe on windows for tests
Diffstat (limited to 'cpp/test/IceStorm/federation/run.py')
-rwxr-xr-xcpp/test/IceStorm/federation/run.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 1df2c868b6f..66e60be1d2e 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -24,7 +24,11 @@ import TestUtil
name = os.path.join("IceStorm", "federation")
testdir = os.path.join(toplevel, "test", name)
-iceBox = os.path.join(toplevel, "bin", "icebox")
+if TestUtil.isWin32() and not TestUtil.isOptimize():
+ iceBox = os.path.join(toplevel, "bin", "iceboxd")
+else:
+ iceBox = os.path.join(toplevel, "bin", "icebox")
+
iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")