summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
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-04 14:33:40 +0200
commitf255b1e8e297e7e1363921580007145cff574e0d (patch)
tree9a799be282e6c0d6544d9f8c872073f83e6c0475 /tests/auto/network/socket/qsocks5socketengine/BLACKLIST
parent7e8705f6632428a8d9a937ab5fe087999347b3dd (diff)
parentbf8fcab8bb92ff534c5cec048d6dbebb3b73a348 (diff)
Merge remote-tracking branch 'origin/dev' into wip/qt6
Diffstat (limited to 'tests/auto/network/socket/qsocks5socketengine/BLACKLIST')
-rw-r--r--tests/auto/network/socket/qsocks5socketengine/BLACKLIST3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/network/socket/qsocks5socketengine/BLACKLIST b/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
index f769aafbdd..61fff6ee00 100644
--- a/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
+++ b/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
@@ -4,8 +4,7 @@
ubuntu-18.04
# QTBUG-74162
[passwordAuth2]
-osx-10.12
-ubuntu-18.04
+ubuntu
[downloadBigFile]
windows-10 msvc-2015
windows-7sp1