diff options
| author | Jose <jose@zeroc.com> | 2016-05-05 17:27:41 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-05 17:27:41 +0200 |
| commit | f6030ffdeb55aefe152a180155d26a8a1b279f1b (patch) | |
| tree | f1821967d8578654fabfedd5462cc1f0d41921fa /scripts/TestUtil.py | |
| parent | Add JavaScript to top level Makefile (diff) | |
| download | ice-f6030ffdeb55aefe152a180155d26a8a1b279f1b.tar.bz2 ice-f6030ffdeb55aefe152a180155d26a8a1b279f1b.tar.xz ice-f6030ffdeb55aefe152a180155d26a8a1b279f1b.zip | |
Do not build iceboxadmin with C++11
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 3a7823196aa..ad7533add6d 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -838,13 +838,10 @@ def getIceBox(): return iceBox def getIceBoxAdmin(): - - lang = getDefaultMapping() - if lang == "java": - iceBoxAdmin = "IceBox.Admin" + if getDefaultMapping() == "java": + return "IceBox.Admin" else: - iceBoxAdmin = string.replace(getIceBox(), "icebox", "iceboxadmin") - return iceBoxAdmin + return getIceExe("iceboxadmin") def getIceGridAdmin(): return getIceExe("icegridadmin") |