diff options
| author | Joe George <joe@zeroc.com> | 2016-03-28 14:31:23 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-03-28 14:31:23 -0400 |
| commit | c8fd4738fda9a36086b933fe0c05161fb0aae015 (patch) | |
| tree | 27460653c0e03f18d968d31bcdb21750c604cd25 /scripts/TestUtil.py | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| parent | Enabling server network tracing causes browser JavaScript tests to hang (diff) | |
| download | ice-c8fd4738fda9a36086b933fe0c05161fb0aae015.tar.bz2 ice-c8fd4738fda9a36086b933fe0c05161fb0aae015.tar.xz ice-c8fd4738fda9a36086b933fe0c05161fb0aae015.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 6c56ac930f2..b466b903923 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -920,14 +920,8 @@ sslConfigTree = { } if isDarwin(): - # - # Use TLS 1.1 for OS X to workaround a bug in Secure Transport TLS - # 1.2 implementation, reported to Apple as bug #18029769. - # - sslConfigTree["cpp"]["client"] += " --IceSSL.Keychain=client.keychain --IceSSL.KeychainPassword=password" + \ - " --IceSSL.ProtocolVersionMax=tls1_1" - sslConfigTree["cpp"]["server"] += " --IceSSL.Keychain=server.keychain --IceSSL.KeychainPassword=password" + \ - " --IceSSL.ProtocolVersionMax=tls1_1" + sslConfigTree["cpp"]["client"] += " --IceSSL.Keychain=client.keychain --IceSSL.KeychainPassword=password" + sslConfigTree["cpp"]["server"] += " --IceSSL.Keychain=server.keychain --IceSSL.KeychainPassword=password" sslConfigTree["cpp"]["colloc"] += " --IceSSL.Keychain=colloc.keychain --IceSSL.KeychainPassword=password" if isWin32(): @@ -1053,6 +1047,7 @@ def getCommandLineProperties(exe, config, cfgName): # Turn on network tracing. # #components.append("--Ice.Trace.Network=3") + #components.append("--Ice.Trace.Protocol=1") # # Now we add additional components depending on the desired configuration. |