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 | |
| 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
| -rwxr-xr-x | cpp/allTests.py | 2 | ||||
| -rw-r--r-- | cpp/config/Make.rules | 2 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index 49ca349425e..023e8ab6c6d 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -81,7 +81,7 @@ tests = [ ("Ice/services", ["once", "nomingw"]), ("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl ("IceBox/configuration", ["core", "noipv6", "novc100", "nomingw", "nomx"]), - ("IceBox/admin", ["core", "noipv6", "novc100", "nomingw", "nomx"]), + ("IceBox/admin", ["core", "noipv6", "novc100", "nomingw", "nomx", "noc++11"]), ("IceStorm/single", ["service", "novc100", "noappverifier", "nomingw", "noc++11"]), # This test doesn't work with appverifier ("IceStorm/federation", ["service", "novc100", "nomingw", "noc++11"]), ("IceStorm/federation2", ["service", "novc100", "nomingw", "noc++11"]), diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 3b9a5e45b11..ed6c878e4b0 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -52,7 +52,7 @@ static_projects = test/% # # Components and projects which are built with C++11 # -cpp11_components = $(coreandstub_components) icebox iceboxadmin +cpp11_components = $(coreandstub_components) icebox cpp11_projects = test/Common \ test/IceUtil/% \ 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") |