Merge branch 'mx' into encoding11

Conflicts:
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/backup/.depend.mak
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/bench/.depend.mak
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/casino/.depend.mak
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/customEvictor/.depend.mak
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/library/.depend.mak
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/phonebook/.depend.mak
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Freeze/transform/.depend.mak
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/callback/.depend.mak
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Glacier2/chat/.depend.mak
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/async/.depend.mak
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/bidir/.depend.mak
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/callback/.depend.mak
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/converter/.depend.mak
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/hello/.depend.mak
	cpp/demo/Ice/interleaved/.depend
	cpp/demo/Ice/interleaved/.depend.mak
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/invoke/.depend.mak
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/latency/.depend.mak
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/minimal/.depend.mak
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/multicast/.depend.mak
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nested/.depend.mak
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/nrvo/.depend.mak
	cpp/demo/Ice/plugin/.depend
	cpp/demo/Ice/plugin/.depend.mak
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/session/.depend.mak
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/throughput/.depend.mak
	cpp/demo/Ice/value/.depend
	cpp/demo/Ice/value/.depend.mak
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceBox/hello/.depend.mak
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/allocate/.depend.mak
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/icebox/.depend.mak
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/replication/.depend.mak
	cpp/demo/IceGrid/secure/.depend
	cpp/demo/IceGrid/secure/.depend.mak
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/sessionActivation/.depend.mak
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceGrid/simple/.depend.mak
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/clock/.depend.mak
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/counter/.depend.mak
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated/.depend.mak
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/IceStorm/replicated2/.depend.mak
	cpp/demo/book/evictor_filesystem/.depend
	cpp/demo/book/evictor_filesystem/.depend.mak
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/lifecycle/.depend.mak
	cpp/demo/book/map_filesystem/.depend
	cpp/demo/book/map_filesystem/.depend.mak
	cpp/demo/book/printer/.depend
	cpp/demo/book/printer/.depend.mak
	cpp/demo/book/simple_filesystem/.depend
	cpp/demo/book/simple_filesystem/.depend.mak
	cpp/include/Ice/Outgoing.h
	cpp/include/Ice/OutgoingAsync.h
	cpp/include/Ice/StreamTraits.h
	cpp/src/Freeze/.depend
	cpp/src/Freeze/.depend.mak
	cpp/src/FreezeScript/.depend
	cpp/src/FreezeScript/.depend.mak
	cpp/src/Glacier2/.depend
	cpp/src/Glacier2/.depend.mak
	cpp/src/Glacier2Lib/.depend
	cpp/src/Glacier2Lib/.depend.mak
	cpp/src/Ice/.depend
	cpp/src/Ice/.depend.mak
	cpp/src/IceBox/.depend
	cpp/src/IceBox/.depend.mak
	cpp/src/IceDB/.depend
	cpp/src/IceDB/.depend.mak
	cpp/src/IceGrid/.depend
	cpp/src/IceGrid/.depend.mak
	cpp/src/IceGrid/FreezeDB/.depend
	cpp/src/IceGrid/FreezeDB/.depend.mak
	cpp/src/IceGrid/ServerCache.h
	cpp/src/IceGrid/ServerI.h
	cpp/src/IceGridLib/.depend
	cpp/src/IceGridLib/.depend.mak
	cpp/src/IcePatch2/.depend
	cpp/src/IcePatch2/.depend.mak
	cpp/src/IcePatch2Lib/.depend
	cpp/src/IcePatch2Lib/.depend.mak
	cpp/src/IceSSL/.depend
	cpp/src/IceSSL/.depend.mak
	cpp/src/IceStorm/.depend
	cpp/src/IceStorm/.depend.mak
	cpp/src/IceStorm/FreezeDB/.depend
	cpp/src/IceStorm/FreezeDB/.depend.mak
	cpp/src/IceStormLib/.depend
	cpp/src/IceStormLib/.depend.mak
	cpp/src/slice2cpp/Gen.cpp
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/complex/.depend.mak
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/dbmap/.depend.mak
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/evictor/.depend.mak
	cpp/test/Freeze/fileLock/.depend
	cpp/test/Freeze/fileLock/.depend.mak
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/dbmap/.depend.mak
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/FreezeScript/evictor/.depend.mak
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/attack/.depend.mak
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend.mak
	cpp/test/Glacier2/override/.depend
	cpp/test/Glacier2/override/.depend.mak
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/router/.depend.mak
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/sessionControl/.depend.mak
	cpp/test/Glacier2/sessionHelper/.depend
	cpp/test/Glacier2/sessionHelper/.depend.mak
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/ssl/.depend.mak
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Glacier2/staticFiltering/.depend.mak
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/adapterDeactivation/.depend.mak
	cpp/test/Ice/ami/.depend
	cpp/test/Ice/ami/.depend.mak
	cpp/test/Ice/background/.depend
	cpp/test/Ice/background/.depend.mak
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/binding/.depend.mak
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/.depend.mak
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/checksum/server/.depend.mak
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/custom/.depend.mak
	cpp/test/Ice/defaultServant/.depend
	cpp/test/Ice/defaultServant/.depend.mak
	cpp/test/Ice/defaultValue/.depend
	cpp/test/Ice/defaultValue/.depend.mak
	cpp/test/Ice/dispatcher/.depend
	cpp/test/Ice/dispatcher/.depend.mak
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/exceptions/.depend.mak
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/facets/.depend.mak
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/faultTolerance/.depend.mak
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/gc/.depend.mak
	cpp/test/Ice/hash/.depend
	cpp/test/Ice/hash/.depend.mak
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/hold/.depend.mak
	cpp/test/Ice/info/.depend
	cpp/test/Ice/info/.depend.mak
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/inheritance/.depend.mak
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/interceptor/.depend.mak
	cpp/test/Ice/invoke/.depend
	cpp/test/Ice/invoke/.depend.mak
	cpp/test/Ice/location/.depend
	cpp/test/Ice/location/.depend.mak
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/objects/.depend.mak
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/operations/.depend.mak
	cpp/test/Ice/plugin/.depend
	cpp/test/Ice/plugin/.depend.mak
	cpp/test/Ice/properties/.depend
	cpp/test/Ice/properties/.depend.mak
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/proxy/.depend.mak
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/retry/.depend.mak
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/servantLocator/.depend.mak
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/exceptions/.depend.mak
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/slicing/objects/.depend.mak
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stream/.depend.mak
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/stringConverter/.depend.mak
	cpp/test/Ice/threadPoolPriority/.depend
	cpp/test/Ice/threadPoolPriority/.depend.mak
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/timeout/.depend.mak
	cpp/test/Ice/udp/.depend
	cpp/test/Ice/udp/.depend.mak
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceBox/configuration/.depend.mak
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/activation/.depend.mak
	cpp/test/IceGrid/admin/.depend
	cpp/test/IceGrid/admin/.depend.mak
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/allocation/.depend.mak
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/deployer/.depend.mak
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/distribution/.depend.mak
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replicaGroup/.depend.mak
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/replication/.depend.mak
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/session/.depend.mak
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/simple/.depend.mak
	cpp/test/IceGrid/update/.depend
	cpp/test/IceGrid/update/.depend.mak
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceSSL/configuration/.depend.mak
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation/.depend.mak
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/federation2/.depend.mak
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/rep1/.depend.mak
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repgrid/.depend.mak
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/repstress/.depend.mak
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/single/.depend.mak
	cpp/test/IceStorm/stress/.depend
	cpp/test/IceStorm/stress/.depend.mak
	cpp/test/Slice/keyword/.depend
	cpp/test/Slice/keyword/.depend.mak
	cpp/test/Slice/parser/.depend
	cpp/test/Slice/parser/.depend.mak
	cpp/test/Slice/structure/.depend
	cpp/test/Slice/structure/.depend.mak
	py/modules/IcePy/.depend
	py/modules/IcePy/.depend.mak

1 files changed, 17 insertions, 3 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 66abe03578b..51e262eb1ac 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 
-import sys, os, re, getopt, time, string, threading, atexit
+import sys, os, re, getopt, time, string, threading, atexit, platform
 
 # Global flags and their default values.
 protocol = ""                   # If unset, default to TCP. Valid values are "tcp" or "ssl".
@@ -845,6 +845,13 @@ def getCommandLineProperties(exe, config):
     #components.append("--Ice.Trace.Network=3")
 
     #
+    # Turn on instrumentation
+    #
+    #components.append("--Ice.Admin.Endpoints=tcp");
+    #components.append("--Ice.Admin.InstanceName=" + config.type);
+    #components.append("--IceMX.Metrics.Debug.GroupBy=id");
+
+    #
     # Now we add additional components dependent on the desired
     # configuration.
     #
@@ -865,7 +872,9 @@ def getCommandLineProperties(exe, config):
         components.append("--Ice.ThreadPool.Server.Serialize=1")
 
     if config.type == "server" or config.type == "colloc" and config.lang == "py":
-        components.append("--Ice.ThreadPool.Server.Size=1 --Ice.ThreadPool.Server.SizeMax=3 --Ice.ThreadPool.Server.SizeWarn=0")
+        components.append("--Ice.ThreadPool.Server.Size=1")
+        components.append("--Ice.ThreadPool.Server.SizeMax=3")
+        components.append("--Ice.ThreadPool.Server.SizeWarn=0")
 
     if config.type == "server":
         components.append("--Ice.PrintAdapterReady=1")
@@ -906,7 +915,10 @@ def getCommandLine(exe, config, options = ""):
         if x64:
             arch = "arch -x86_64 "
         else:
-            arch = "arch -i386 "
+            # We don't really know what architecture the binaries were
+            # built with, prefer 32 bits if --x64 is not set and if 32
+            # bits binaries aren't available, 64 bits will be used.
+            arch = "arch -i386 -x86_64 "
 
     output = getStringIO()
 
@@ -1085,6 +1097,8 @@ def spawnClient(cmd, env=None, cwd=None, echo=True, startReader=True, lang=None)
 
 def spawnServer(cmd, env=None, cwd=None, count=1, adapter=None, echo=True, lang=None):
     server = spawn(cmd, env, quoteArgument(cwd), lang=lang)
+    # Count + 1 if IceMX enabled
+    #cout = count + 1
     if adapter:
         server.expect("%s ready\n" % adapter)
     else: