summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 1dc926f5e13..82e0e626d53 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -16,8 +16,8 @@ import sys, os
# 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
@@ -32,13 +32,14 @@ host = ""
#
if protocol == "ssl":
- clientProtocol = " --Ice.DefaultProtocol=ssl" + \
- " --Ice.SSL.Client.CertPath=TOPLEVELDIR/certs --Ice.SSL.Client.Config=client_sslconfig.xml"
- serverProtocol = " --Ice.DefaultProtocol=ssl" + \
- " --Ice.SSL.Server.CertPath=TOPLEVELDIR/certs --Ice.SSL.Server.Config=server_sslconfig.xml"
- clientServerProtocol = " --Ice.DefaultProtocol=ssl" + \
- " --Ice.SSL.Client.CertPath=TOPLEVELDIR/certs --Ice.SSL.Client.Config=sslconfig.xml" + \
- " --Ice.SSL.Server.CertPath=TOPLEVELDIR/certs --Ice.SSL.Server.Config=sslconfig.xml"
+ plugin = " --Ice.Plugin.IceSSL=IceSSL:create"
+ clientProtocol = plugin + " --Ice.DefaultProtocol=ssl" + \
+ " --IceSSL.Client.CertPath=TOPLEVELDIR/certs --IceSSL.Client.Config=client_sslconfig.xml"
+ serverProtocol = plugin + " --Ice.DefaultProtocol=ssl" + \
+ " --IceSSL.Server.CertPath=TOPLEVELDIR/certs --IceSSL.Server.Config=server_sslconfig.xml"
+ clientServerProtocol = plugin + " --Ice.DefaultProtocol=ssl" + \
+ " --IceSSL.Client.CertPath=TOPLEVELDIR/certs --IceSSL.Client.Config=sslconfig.xml" + \
+ " --IceSSL.Server.CertPath=TOPLEVELDIR/certs --IceSSL.Server.Config=sslconfig.xml"
else:
clientProtocol = ""
serverProtocol = ""