1 files changed, 32 insertions, 2 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 2a280874100..fa706036e3b 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -14,8 +14,8 @@
 # protocol. Otherwise TCP is used.
 #
 
-protocol = "ssl"
-#protocol = ""
+#protocol = "ssl"
+protocol = ""
 
 #
 # Set the host to the host name the test servers are running on. If not
@@ -132,6 +132,36 @@ def clientServerTest(toplevel, name):
 	    break;
 	print output,
 
+def clientServerHybridTest(toplevel, name):
+
+    testdir = os.path.join(toplevel, "test", name)
+    server = os.path.join(testdir, "server")
+    client = os.path.join(testdir, "client")
+
+    updatedServerOptions = clientServerOptions.replace("TOPLEVELDIR", toplevel)
+    updatedClientOptions = updatedServerOptions
+
+    print "starting server...",
+    serverPipe = os.popen(server + updatedServerOptions)
+    getServerPid(serverPipe)
+    getAdapterReady(serverPipe)
+    print "ok"
+    
+    print "starting client...",
+    clientPipe = os.popen(client + updatedClientOptions)
+    output = clientPipe.readline()
+    if not output:
+	print "failed!"
+	killServers()
+	sys.exit(1)
+    print "ok"
+    print output,
+    while 1:
+	output = clientPipe.readline()
+	if not output:
+	    break;
+	print output,
+
 def collocatedTest(toplevel, name):
 
     testdir = os.path.join(toplevel, "test", name)