diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-09-17 15:05:23 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-09-17 15:05:23 -0230 |
| commit | a1aaac0e077cc4b4a97a985a9947d6415c771932 (patch) | |
| tree | b5e568d95017620ed9a4ddac58143df7352449ac /scripts | |
| parent | Minor style fixes (diff) | |
| download | ice-a1aaac0e077cc4b4a97a985a9947d6415c771932.tar.bz2 ice-a1aaac0e077cc4b4a97a985a9947d6415c771932.tar.xz ice-a1aaac0e077cc4b4a97a985a9947d6415c771932.zip | |
ICE-6774 added iceboxadmin test to IceBox/admin
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/TestUtil.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 36bfd5c7d1e..6b22fbc1faf 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -777,7 +777,6 @@ def phpSetup(clientConfig = False, iceOptions = None, iceProfile = None): tmpini.close() def getIceBox(): - global compact global cpp11 # @@ -799,15 +798,22 @@ def getIceBox(): elif lang == "java": iceBox = "IceBox.Server" elif lang == "csharp": - if compact: - iceBox = os.path.join(getIceDir("csharp"), "bin", "cf", "iceboxnet") - else: - iceBox = os.path.join(getIceDir("csharp"), "bin", "iceboxnet") + iceBox = os.path.join(getIceDir("csharp"), "bin", "iceboxnet") return iceBox def getIceBoxAdmin(): - return getIceExe("iceboxadmin") + # + # Get and return the path of the IceBoxAdmin executable + # + lang = getDefaultMapping() + if lang == "java": + iceBoxAdmin = "IceBox.Admin" + else: + return getIceExe("iceboxadmin") + iceBoxAdmin = "iceboxadmin" + + return iceBoxAdmin def getIceGridAdmin(): return getIceExe("icegridadmin") |