updates to the custom run.py scripts. Updates to TestUtil.py to spawn a

    reader thread for servers.

1 files changed, 5 insertions, 25 deletions

diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index d10a7b8f860..786697fcc2b 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -29,12 +29,12 @@ client = os.path.join(testdir, "client")
 num = 12
 base = 12340
 
-serverPipes = { }
+serverThreads = { }
 for i in range(0, num):
     print "starting server #%d..." % (i + 1),
-    serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1")
-    TestUtil.getServerPid(serverPipes[i])
-    TestUtil.getAdapterReady(serverPipes[i])
+    serverPipe = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1")
+    TestUtil.getServerPid(serverPipe)
+    TestUtil.getAdapterReady(serverPipe)
     print "ok"
 
 ports = ""
@@ -45,31 +45,11 @@ clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports + " 2>&1")
 print "ok"
 
 TestUtil.printOutputFromPipe(clientPipe)
-
 clientStatus = TestUtil.closePipe(clientPipe)
-serverStatus = None
-for i in range(0, num):
-    serverStatus = serverStatus or TestUtil.closePipe(serverPipes[i])
-
 if clientStatus:
     TestUtil.killServers()
-    sys.exit(1)
 
-#
-# Exit with status 0 even though some servers failed to shutdown
-# properly. There's a problem which is occuring on Linux dual-processor
-# machines, when ssl isn't enabled, and which cause some servers to
-# segfault and abort. It's not clear what the problem is, and it's
-# almost impossible to debug with the very poor information we get
-# from the core file (ulimit -c unlimited to enable core files on
-# Linux).
-#
-if serverStatus:
-    TestUtil.killServers()
+if clientStatus or TestUtil.serverStatus():
     sys.exit(1)
-#    if TestUtil.isWin32():
-#        sys.exit(1)
-#    else:
-#        sys.exit(0)
 
 sys.exit(0)