summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl/qsslsocket/BLACKLIST
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2017-04-27 11:32:16 +0000
committerEdward Welbourne <edward.welbourne@qt.io>2017-04-27 12:25:51 +0000
commitb6968f508c36c650c9965f1747beae8fa6b237c5 (patch)
tree044f5991838e4d1622806125e7e0202a6f9b526e /tests/auto/network/ssl/qsslsocket/BLACKLIST
parent11e37a0e8c9e2c17d13b1ab44ca9b3f35b7a9844 (diff)
Revert "Blacklist tst_QSslSocket::protocolServerSide on OS X 10.11"
This reverts commit 96c27f0dfa72f7800c85af10c00e0dababdc3fbf. We now use a custom keychain that should fix the original problem with the test. Change-Id: I52e4105f34a46ad7080750d9a62480ebe3a56e68 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/network/ssl/qsslsocket/BLACKLIST')
-rw-r--r--tests/auto/network/ssl/qsslsocket/BLACKLIST2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/BLACKLIST b/tests/auto/network/ssl/qsslsocket/BLACKLIST
index cfab0b7eb0..52c023b78f 100644
--- a/tests/auto/network/ssl/qsslsocket/BLACKLIST
+++ b/tests/auto/network/ssl/qsslsocket/BLACKLIST
@@ -5,5 +5,3 @@ windows
rhel-7.2
[protocolServerSide:tls1.0-any]
rhel-7.2
-[protocolServerSide]
-osx-10.11