Fixed communicator flushBatchRequests to allow tracing

1 files changed, 11 insertions, 1 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 4153ba28205..e94145ed17a 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -844,6 +844,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.
     #
@@ -864,7 +871,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")
@@ -1084,6 +1093,7 @@ 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
     if adapter:
         server.expect("%s ready\n" % adapter)
     else: