diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /tests/auto/network/socket | |
parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'tests/auto/network/socket')
4 files changed, 4 insertions, 22 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 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 + diff --git a/tests/auto/network/socket/qtcpsocket/BLACKLIST b/tests/auto/network/socket/qtcpsocket/BLACKLIST index 8c2f8d2638..07532710b3 100644 --- a/tests/auto/network/socket/qtcpsocket/BLACKLIST +++ b/tests/auto/network/socket/qtcpsocket/BLACKLIST @@ -5,9 +5,6 @@ windows-7sp1 windows [bind:[::]:randomport] windows -[timeoutConnect] -windows-10 msvc-2015 -# QTBUG-66247 [timeoutConnect:ip] windows # QTBUG-66247 diff --git a/tests/auto/network/socket/qudpsocket/BLACKLIST b/tests/auto/network/socket/qudpsocket/BLACKLIST index 9b5aa8a3fc..bc6068d695 100644 --- a/tests/auto/network/socket/qudpsocket/BLACKLIST +++ b/tests/auto/network/socket/qudpsocket/BLACKLIST @@ -2,15 +2,9 @@ windows-10 msvc-2017 windows-10 msvc-2015 windows-7sp1 -[multicastLeaveAfterClose] -osx-10.12 -osx-10.11 [readyReadForEmptyDatagram] opensuse-leap -ubuntu-16.04 [echo] opensuse-42.3 -[ipv6Loop] -osx-10.12 [readyReadForEmptyDatagram] linux |