diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-11-15 14:22:59 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-11-15 14:22:59 +0000 |
| commit | 27cf91cfd02c30e23a64d6317f00ac33c71eaac4 (patch) | |
| tree | 0e006e131b2d16a59aec88aa6af6511f0657d41d | |
| parent | Bug 629 - Check whether optimized on windows to determine icebox executable (diff) | |
| download | ice-27cf91cfd02c30e23a64d6317f00ac33c71eaac4.tar.bz2 ice-27cf91cfd02c30e23a64d6317f00ac33c71eaac4.tar.xz ice-27cf91cfd02c30e23a64d6317f00ac33c71eaac4.zip | |
Bug 629 - Use correct icebox exe on windows for tests
| -rwxr-xr-x | cpp/test/IceStorm/federation/run.py | 6 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/federation2/run.py | 6 |
2 files changed, 10 insertions, 2 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") diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index 730e23d5dbe..73003eb953e 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -26,7 +26,11 @@ testdir = os.path.join(toplevel, "test", name) exedir = os.path.join(toplevel, "test", "IceStorm", "federation") -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") |