summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket/qsocks5socketengine
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-08-15 13:09:55 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-08-15 16:53:19 +0200
commitc7ec7cd2a1ae9bec31113fae1f1e549b2bf98e0b (patch)
treefc81fba4e7815ea061da277cf3bcf3102866932f /tests/auto/network/socket/qsocks5socketengine
parent7947032e2d1d68b2c0f79874db7adcf560851f29 (diff)
parent6132260da394a9627947f0fe6a279c20863b6ad2 (diff)
Merge branch 'wip/qt6' into wip/cmake
Diffstat (limited to 'tests/auto/network/socket/qsocks5socketengine')
-rw-r--r--tests/auto/network/socket/qsocks5socketengine/BLACKLIST11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/network/socket/qsocks5socketengine/BLACKLIST b/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
index 8af3cea8dc..f769aafbdd 100644
--- a/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
+++ b/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
@@ -1,11 +1,12 @@
[udpTest]
*
[passwordAuth]
-*
+ubuntu-18.04
# QTBUG-74162
[passwordAuth2]
-*
-[serverTest]
-windows
+osx-10.12
+ubuntu-18.04
[downloadBigFile]
-windows
+windows-10 msvc-2015
+windows-7sp1
+