Build & test fixes:

  * ICE-5929 - Consider using $ORIGIN on Linux
  * ICE-5949 - IceBox issues on Linux bi-arch
  * ICE-5954 - Ubuntu make install issue / ORIGIN bug
  * ICE-5961 - OSX: test/IceGrid/session fails
  * ICE-5971 - allTests.py incorrect reporting under Windows?

1 files changed, 15 insertions, 4 deletions

diff --git a/cpp/allDemos.py b/cpp/allDemos.py
index ef5d576842c..b7d54ead583 100755
--- a/cpp/allDemos.py
+++ b/cpp/allDemos.py
@@ -47,8 +47,8 @@ demos = [
     "IceDiscovery/hello",
     "IceDiscovery/replication",
     "IceStorm/clock",
+    "IceBox/hello",
     "IceStorm/counter",
-    "IceStorm/replicated",
     "IceStorm/replicated2",
     "IceGrid/allocate",
     "IceGrid/customLoadBalancing",
@@ -62,7 +62,6 @@ demos = [
     "Freeze/customEvictor",
     "Freeze/phonebook",
     "Freeze/library",
-    "Freeze/backup",
     "Freeze/transform",
     "Freeze/casino",
     "Manual/map_filesystem",
@@ -71,8 +70,20 @@ demos = [
     "Manual/printer",
     "Manual/lifecycle"]
 
-if not Util.isNoServices():
-    demos += ["IceBox/hello", "IceGrid/icebox"]
+#
+# 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.
+#
+if not Util.isX86():
+    demos += ["Freeze/backup"]
 
 if __name__ == "__main__":
     Util.run(demos)