diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-03-29 15:13:11 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-03-29 15:13:11 +0000 |
| commit | cf47b86cbdcb3ae99edfbe537e02d5d0ead3f48d (patch) | |
| tree | bffe114a56d0b44b535d96565ba03eccd2acfad4 /cppe/config/TestUtil.py | |
| parent | Fixed shutdown bug. (diff) | |
| download | ice-cf47b86cbdcb3ae99edfbe537e02d5d0ead3f48d.tar.bz2 ice-cf47b86cbdcb3ae99edfbe537e02d5d0ead3f48d.tar.xz ice-cf47b86cbdcb3ae99edfbe537e02d5d0ead3f48d.zip | |
Remove ssl support
Diffstat (limited to 'cppe/config/TestUtil.py')
| -rw-r--r-- | cppe/config/TestUtil.py | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/cppe/config/TestUtil.py b/cppe/config/TestUtil.py index 18240277126..ba3f1b67be7 100644 --- a/cppe/config/TestUtil.py +++ b/cppe/config/TestUtil.py @@ -9,14 +9,6 @@ # ********************************************************************** # -# Set protocol to "ssl" in case you want to run the tests with the SSL -# protocol. Otherwise TCP is used. -# - -protocol = "" -#protocol = "ssl" - -# # Set compressed to 1 in case you want to run the tests with # protocol compression. # @@ -25,14 +17,6 @@ protocol = "" compress = 1 # -# Set threadPerConnection to 1 in case you want to run the tests in -# thread per connection mode. -# - -#threadPerConnection = 0 -threadPerConnection = 1 - -# # If you don't set "host" below, then the Ice library will try to find # out the IP address of this host. For the Ice test suite, it's best # to set the IP address explicitly to 127.0.0.1. This avoid problems @@ -204,23 +188,9 @@ else: os.environ["LD_LIBRARY_PATH"] = os.path.join(toplevel, "lib") + ":" + os.getenv("LD_LIBRARY_PATH", "") os.environ["LD_LIBRARY_PATH_64"] = os.path.join(toplevel, "lib") + ":" + os.getenv("LD_LIBRARY_PATH_64", "") -if protocol == "ssl": - plugin = " --Ice.Plugin.IceSSL=IceSSL:create" - clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Client.Config=client_sslconfig.xml" - serverProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Server.Config=server_sslconfig.xml" - clientServerProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Client.Config=sslconfig.xml" + \ - " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Server.Config=sslconfig.xml" -else: - clientProtocol = "" - serverProtocol = "" - clientServerProtocol = "" +clientProtocol = "" +serverProtocol = "" +clientServerProtocol = "" if compress: clientProtocol += " --Ice.Override.Compress" |