diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-21 11:23:46 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-21 11:23:46 +0100 |
| commit | ece27afbb77e4a0b7d12155513031903407e2901 (patch) | |
| tree | b7eb8e66a3be53c4312de5ab62c754b28b096f79 /scripts/TestUtil.py | |
| parent | C# test/Ice/enums build failure (diff) | |
| download | ice-ece27afbb77e4a0b7d12155513031903407e2901.tar.bz2 ice-ece27afbb77e4a0b7d12155513031903407e2901.tar.xz ice-ece27afbb77e4a0b7d12155513031903407e2901.zip | |
Fixed C# IceBox test failures with SSL
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 2f431b3231f..fbee1ee8838 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -680,7 +680,7 @@ sslConfigTree = { "colloc" : " --IceSSL.Keystore=client.jks" }, "cs" : { - "plugin" : " --Ice.Plugin.IceSSL=IceSSL:IceSSL.PluginFactory --Ice.Default.Protocol=ssl" + + "plugin" : " --Ice.Plugin.IceSSL=%(icesslcs)s:IceSSL.PluginFactory --Ice.Default.Protocol=ssl" + " --IceSSL.Password=password --IceSSL.DefaultDir=%(certsdir)s", "client" : " --IceSSL.CertFile=c_rsa1024.pfx --IceSSL.CheckCertName=0", "server" : " --IceSSL.CertFile=s_rsa1024.pfx --IceSSL.ImportCert.CurrentUser.Root=cacert.pem", @@ -814,6 +814,7 @@ def getCommandLineProperties(exe, config): if config.protocol == "ssl": sslenv = {} sslenv["certsdir"] = quoteArgument(os.path.abspath(os.path.join(toplevel, "certs"))) + sslenv["icesslcs"] = quoteArgument("\\\"" + os.path.join(getIceDir("cs"), "Assemblies", "IceSSL.dll") + "\\\"") if winrt: sslenv["verifyPeer"] = "0" else: |