diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-11-18 16:24:02 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-11-18 16:24:02 +0100 |
| commit | dfef9c7cf9ee1d205aaa76cb2c018741a0a40bd8 (patch) | |
| tree | c28c09f01b858ef1a6fcdfa1e98e57386c89a682 /scripts/TestUtil.py | |
| parent | Fixed some comments in gradle.properties (diff) | |
| download | ice-dfef9c7cf9ee1d205aaa76cb2c018741a0a40bd8.tar.bz2 ice-dfef9c7cf9ee1d205aaa76cb2c018741a0a40bd8.tar.xz ice-dfef9c7cf9ee1d205aaa76cb2c018741a0a40bd8.zip | |
Fixes for ICE-5910: merged makecerts.py with makewinrtcerts.py, removed WinRT certs
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 0efb2e00a95..b6abdeb6ba3 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -881,14 +881,10 @@ def getCommandLineProperties(exe, config): if config.protocol == "ssl" or config.protocol == "wss": sslenv = {} sslenv["icesslcs"] = quoteArgument("\\\"" + os.path.join(getIceDir("cs"), "Assemblies", "IceSSL.dll") + "\\\"") - if winrt: - sslenv["certsdir"] = quoteArgument(os.path.abspath(os.path.join(toplevel, "certs", "winrt"))) - sslenv["verifyPeer"] = "0" - elif config.protocol == "wss": - sslenv["certsdir"] = quoteArgument(os.path.abspath(os.path.join(toplevel, "certs"))) + sslenv["certsdir"] = quoteArgument(os.path.abspath(os.path.join(toplevel, "certs"))) + if winrt or config.protocol == "wss": sslenv["verifyPeer"] = "0" else: - sslenv["certsdir"] = quoteArgument(os.path.abspath(os.path.join(toplevel, "certs"))) sslenv["verifyPeer"] = "2" components.append(sslConfigTree[config.lang]["plugin"] % sslenv) components.append(sslConfigTree[config.lang][config.type] % sslenv) |