summaryrefslogtreecommitdiff
path: root/scripts/tests/IceSSL/configuration.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/tests/IceSSL/configuration.py')
-rw-r--r--scripts/tests/IceSSL/configuration.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/tests/IceSSL/configuration.py b/scripts/tests/IceSSL/configuration.py
index 7c951fa8bd5..fbd0d5bb64f 100644
--- a/scripts/tests/IceSSL/configuration.py
+++ b/scripts/tests/IceSSL/configuration.py
@@ -48,7 +48,12 @@ class ConfigurationTestCase(ClientServerTestCase):
# Filter-out the deprecated property warnings
outfilters = [ lambda x: re.sub("-! .* warning: deprecated property: IceSSL.KeyFile\n", "", x) ]
+#
+# With UWP, we can't run this test with the UWP C++ server (used with tcp/ws)
+#
+options=lambda current: { "protocol": ["ssl", "wss"] } if current.config.uwp else {}
+
TestSuite(__name__, [
ConfigurationTestCase(client=Client(outfilters=outfilters, args=['"{testdir}"']),
- server=Server(outfilters=outfilters))
-], multihost=False)
+ server=Server(outfilters=outfilters, args=['"{testdir}"']))
+], multihost=False, options=options)