diff options
Diffstat (limited to 'cpp')
| -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") |