Support for IceBox services MetricsAdmin and IceStorm metrics

1 files changed, 10 insertions, 6 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index e94145ed17a..858169ba928 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".
@@ -846,9 +846,9 @@ def getCommandLineProperties(exe, config):
     #
     # Turn on instrumentation
     #
-    components.append("--Ice.Admin.Endpoints=tcp");
-    components.append("--Ice.Admin.InstanceName=" + config.type);
-    components.append("--IceMX.Metrics.Debug.GroupBy=id");
+    #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
@@ -914,7 +914,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()
 
@@ -1093,7 +1096,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)
-    cout = count + 1
+    # Count + 1 if IceMX enabled
+    #cout = count + 1
     if adapter:
         server.expect("%s ready\n" % adapter)
     else: