Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev

4 files changed, 36 insertions, 7 deletions

diff --git a/tests/auto/network/socket/qtcpsocket/BLACKLIST b/tests/auto/network/socket/qtcpsocket/BLACKLIST
new file mode 100644
index 0000000000..5fc2589323
--- /dev/null
+++ b/tests/auto/network/socket/qtcpsocket/BLACKLIST
@@ -0,0 +1,13 @@
+[bindThenResolveHost:first-fail]
+windows
+[bind:[::]]
+windows
+[bind:[::]:randomport]
+windows
+[invalidProxy:socks5-on-http]
+windows
+[disconnectWhileLookingUp]
+windows
+[timeoutConnect:ip]
+windows
+]
diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro
index 2dc1490256..337e75b372 100644
--- a/tests/auto/network/socket/qtcpsocket/test/test.pro
+++ b/tests/auto/network/socket/qtcpsocket/test/test.pro
@@ -15,5 +15,3 @@ win32 {
 } else {
     DESTDIR = ../
 }
-
-win32: CONFIG += insignificant_test # Hangs in release builds
diff --git a/tests/auto/network/socket/qudpsocket/BLACKLIST b/tests/auto/network/socket/qudpsocket/BLACKLIST
index 3e936aebf6..6669b094ce 100644
--- a/tests/auto/network/socket/qudpsocket/BLACKLIST
+++ b/tests/auto/network/socket/qudpsocket/BLACKLIST
@@ -1,8 +1,28 @@
 [multicast:same bind, group ipv6 address]
 *
-[multicast:valid bind, group ipv6 address]
+[multicast]
 osx
-[multicast:dual bind, group ipv6 address]
+[writeDatagramToNonExistingPeer]
+windows
 osx
-[multicast:same bind, group ipv4 address]
+[asyncReadDatagram]
+windows
 osx
+[multicastLeaveAfterClose]
+osx
+[readyRead]
+osx
+[readyReadForEmptyDatagram]
+osx
+[echo]
+linux
+osx
+[ipv6Loop]
+osx
+[loop]
+osx
+[broadcasting]
+osx
+[zeroLengthDatagram]
+osx
+
diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro
index efa50b21b4..73486a2bc3 100644
--- a/tests/auto/network/socket/qudpsocket/test/test.pro
+++ b/tests/auto/network/socket/qudpsocket/test/test.pro
@@ -16,5 +16,3 @@ win32 {
 }
 
 TARGET = tst_qudpsocket
-
-CONFIG+=insignificant_test # QTBUG-25367, QTBUG-25368