summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-02-06 08:36:07 +0100
committerBenoit Foucher <benoit@zeroc.com>2013-02-06 08:36:07 +0100
commite973fcc802ee8b0a248e309d408792f17865702a (patch)
tree2f11d2964cd7247d86427f791d061401aaf09a61 /scripts/TestUtil.py
parentIceGrid/icebox demo README minor fix (diff)
downloadice-e973fcc802ee8b0a248e309d408792f17865702a.tar.bz2
ice-e973fcc802ee8b0a248e309d408792f17865702a.tar.xz
ice-e973fcc802ee8b0a248e309d408792f17865702a.zip
Finished fixing ICE-5180: Surface WinRT support
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index b0f18ae0f5b..f85486f2d8c 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -836,11 +836,12 @@ 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["certsdir"] = quoteArgument(os.path.abspath(os.path.join(toplevel, "certs", "winrt")))
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)