diff options
| author | Jose <jose@zeroc.com> | 2014-11-27 18:05:41 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-27 18:05:41 +0100 |
| commit | 72ca71f77de0262acc5b0b786f3b07e684a8a4cd (patch) | |
| tree | b7b5fe4a1619359695e2a08265a6d24ba79bf1c5 /cpp/allDemos.py | |
| parent | Fixes for ICE-5984 & ICE-5965: binding test warwnings with WS (diff) | |
| download | ice-72ca71f77de0262acc5b0b786f3b07e684a8a4cd.tar.bz2 ice-72ca71f77de0262acc5b0b786f3b07e684a8a4cd.tar.xz ice-72ca71f77de0262acc5b0b786f3b07e684a8a4cd.zip | |
Fixed (ICE-5987) - remove i386 from OS X binaries
Diffstat (limited to 'cpp/allDemos.py')
| -rwxr-xr-x | cpp/allDemos.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/cpp/allDemos.py b/cpp/allDemos.py index b7d54ead583..3d9c1e04973 100755 --- a/cpp/allDemos.py +++ b/cpp/allDemos.py @@ -51,7 +51,8 @@ demos = [ "IceStorm/counter", "IceStorm/replicated2", "IceGrid/allocate", - "IceGrid/customLoadBalancing", + "IceStorm/replicated", + "IceGrid/icebox", "IceGrid/replication", "IceGrid/sessionActivation", "IceGrid/secure", @@ -71,13 +72,6 @@ demos = [ "Manual/lifecycle"] # -# For this demos the descriptor hardcode the icebox name and will -# not work with configurations that use different icebox names. -# -if Util.getIceBox().endswith("icebox"): - demos += ["IceStorm/replicated", "IceGrid/icebox"] - -# # Freeze backup doesn't work on x86 multiarch because it require to # use x86 db tools that are currently not available for x64 # distributions. @@ -85,5 +79,8 @@ if Util.getIceBox().endswith("icebox"): if not Util.isX86(): demos += ["Freeze/backup"] +if not Util.isCpp11(): + demos += ["IceGrid/customLoadBalancing"] + if __name__ == "__main__": Util.run(demos) |