summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl/qsslsocket/BLACKLIST
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-11-24 06:42:34 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-11-24 06:42:34 +0000
commitfbca13949a28cc3e815b829d814514ab78be6ce1 (patch)
treee4d33beeef01dbe54c5e7d7dd13c5427ce5b496d /tests/auto/network/ssl/qsslsocket/BLACKLIST
parentdfa172034e19b6011cc4e7c784b1a5b82996d630 (diff)
parent7c4b0aa9706bdb79f0f79841cf6704e2f613fe69 (diff)
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
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 52c023b78f..a9ecc69f50 100644
--- a/tests/auto/network/ssl/qsslsocket/BLACKLIST
+++ b/tests/auto/network/ssl/qsslsocket/BLACKLIST
@@ -1,6 +1,4 @@
windows
-[waitForConnectedEncryptedReadyRead:WithSocks5ProxyAuth]
-*
[protocolServerSide:ssl3-any]
rhel-7.2
[protocolServerSide:tls1.0-any]