diff options
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/test/IceGrid/deployer/run.py | 5 | ||||
| -rwxr-xr-x | cpp/test/IceGrid/replication/run.py | 5 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/federation/run.py | 6 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/federation2/run.py | 6 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/single/run.py | 6 |
5 files changed, 25 insertions, 3 deletions
diff --git a/cpp/test/IceGrid/deployer/run.py b/cpp/test/IceGrid/deployer/run.py index cfd7025d0e9..76e6d2c76cd 100755 --- a/cpp/test/IceGrid/deployer/run.py +++ b/cpp/test/IceGrid/deployer/run.py @@ -32,6 +32,11 @@ else: os.environ["LD_LIBRARY_PATH"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH", "") os.environ["LD_LIBRARY_PATH_64"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH_64", "") +if TestUtil.isWin32() and os.path.exists(os.path.join(toplevel, "bin", "iceboxd.exe")): + useIceboxd = 1 +else: + useIceboxd = 0 + # # Start the client. # diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py index 64899f49529..d29e866a200 100755 --- a/cpp/test/IceGrid/replication/run.py +++ b/cpp/test/IceGrid/replication/run.py @@ -33,6 +33,11 @@ else: os.environ["LD_LIBRARY_PATH"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH", "") os.environ["LD_LIBRARY_PATH_64"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH_64", "") +if TestUtil.isWin32() and os.path.exists(os.path.join(toplevel, "bin", "iceboxd.exe")): + useIceboxd = 1 +else: + useIceboxd = 0 + # # Add locator options for the client and server. Since the server # invokes on the locator it's also considered to be a client. diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py index 1df2c868b6f..1b2d3c74f53 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 os.path.exists(os.path.join(toplevel, "bin", "iceboxd.exe")): + 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..3896a09c488 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 os.path.exists(os.path.join(toplevel, "bin", "iceboxd.exe")): + 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/single/run.py b/cpp/test/IceStorm/single/run.py index 2089a0b40a6..640ad5014b2 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -24,7 +24,11 @@ import TestUtil name = os.path.join("IceStorm", "single") testdir = os.path.join(toplevel, "test", name) -iceBox = os.path.join(toplevel, "bin", "icebox") +if TestUtil.isWin32() and os.path.exists(os.path.join(toplevel, "bin", "iceboxd.exe")): + 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") |