summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket/qtcpserver
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-09-04 14:33:40 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-09-16 09:41:23 +0200
commit93f2f33a49f6c96a4f94f344edf03164ed944d02 (patch)
tree9a799be282e6c0d6544d9f8c872073f83e6c0475 /tests/auto/network/socket/qtcpserver
parent7e8705f6632428a8d9a937ab5fe087999347b3dd (diff)
parentf255b1e8e297e7e1363921580007145cff574e0d (diff)
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'tests/auto/network/socket/qtcpserver')
-rw-r--r--tests/auto/network/socket/qtcpserver/BLACKLIST14
1 files changed, 3 insertions, 11 deletions
diff --git a/tests/auto/network/socket/qtcpserver/BLACKLIST b/tests/auto/network/socket/qtcpserver/BLACKLIST
index ad0edf0af1..e268468bdb 100644
--- a/tests/auto/network/socket/qtcpserver/BLACKLIST
+++ b/tests/auto/network/socket/qtcpserver/BLACKLIST
@@ -1,24 +1,16 @@
-[listenWhileListening]
-windows-10 msvc-2015
[listenWhileListening:WithSocks5Proxy]
linux
windows
[ipv6Server]
-windows-10 msvc-2015
windows-7sp1
windows-10 msvc-2017
[ipv6Server:WithoutProxy]
windows
osx
-[addressReusable]
-windows-10 msvc-2015
[eagainBlockingAccept]
-windows-10 msvc-2015
-windows-7sp1
-windows-10 msvc-2017
-[proxyFactory]
windows-7sp1
+windows-10
[serverAddress]
-windows-10 msvc-2017
-windows-10 msvc-2015
windows-7sp1
+windows-10
+