diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-09-20 10:46:04 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-09-20 10:46:04 +0000 |
| commit | fe62222cfd7b4afccc68e14fa8252fc37231d125 (patch) | |
| tree | d221b49ac1c2321bfab281c105454dd5912243e0 /cs/config/TestUtil.py | |
| parent | Added IceGrid simple demo (diff) | |
| download | ice-fe62222cfd7b4afccc68e14fa8252fc37231d125.tar.bz2 ice-fe62222cfd7b4afccc68e14fa8252fc37231d125.tar.xz ice-fe62222cfd7b4afccc68e14fa8252fc37231d125.zip | |
committed script changes.
Diffstat (limited to 'cs/config/TestUtil.py')
| -rw-r--r-- | cs/config/TestUtil.py | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/cs/config/TestUtil.py b/cs/config/TestUtil.py index f2ed1d9ae99..92e1ded7891 100644 --- a/cs/config/TestUtil.py +++ b/cs/config/TestUtil.py @@ -158,20 +158,41 @@ if protocol == "ssl": " --IceSSL.Client.Config=sslconfig.xml" + \ " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \ " --IceSSL.Server.Config=sslconfig.xml" + cppPlugin = " --Ice.Plugin.IceSSL=IceSSL:create" + cppClientProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \ + " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \ + " --IceSSL.Client.Config=client_sslconfig.xml" + cppServerProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \ + " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \ + " --IceSSL.Server.Config=server_sslconfig.xml" + cppClientServerProtocol = cppPlugin + " --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 = "" + cppClientProtocol = "" + cppServerProtocol = "" + cppClientServerProtocol = "" if compress: clientProtocol += " --Ice.Override.Compress" serverProtocol += " --Ice.Override.Compress" clientServerProtocol += " --Ice.Override.Compress" + cppClientProtocol += " --Ice.Override.Compress" + cppServerProtocol += " --Ice.Override.Compress" + cppClientServerProtocol += " --Ice.Override.Compress" if threadPerConnection: clientProtocol += " --Ice.ThreadPerConnection" serverProtocol += " --Ice.ThreadPerConnection" clientServerProtocol += " --Ice.ThreadPerConnection" + cppClientProtocol += " --Ice.ThreadPerConnection" + cppServerProtocol += " --Ice.ThreadPerConnection" + cppClientServerProtocol += " --Ice.ThreadPerConnection" if host != "": defaultHost = " --Ice.Default.Host=" + host @@ -185,6 +206,17 @@ commonServerOptions = " --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.NullH " --Ice.ThreadPool.Server.Size=1 --Ice.ThreadPool.Server.SizeMax=3" + \ " --Ice.ThreadPool.Server.SizeWarn=0" +cppCommonClientOptions = " --Ice.Warn.Connections" + +cppCommonServerOptions = " --Ice.PrintAdapterReady" + \ + " --Ice.Warn.Connections --Ice.ServerIdleTime=30" + \ + " --Ice.ThreadPool.Server.Size=1 --Ice.ThreadPool.Server.SizeMax=3" + \ + " --Ice.ThreadPool.Server.SizeWarn=0" + +cppClientOptions = cppClientProtocol + defaultHost + cppCommonClientOptions +cppServerOptions = cppServerProtocol + defaultHost + cppCommonServerOptions +cppClientServerOptions = cppClientServerProtocol + defaultHost + cppCommonServerOptions + clientOptions = clientProtocol + defaultHost + commonClientOptions serverOptions = serverProtocol + defaultHost + commonServerOptions clientServerOptions = clientServerProtocol + defaultHost + commonServerOptions |