diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-30 01:00:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-30 01:00:14 +0200 |
| commit | 17f4d159a90d477dc0c7851e73a0a1cb6a86833e (patch) | |
| tree | 3396f91fc873a5996548cf99cba16fff0e8c7fdd /tests | |
| parent | bff59f87ba11cac1dfa710f021522372de7a776f (diff) | |
| parent | ee6164942d21e7db5b5a6520cb0dbe1b9d631b21 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If9cc79a7cc098104333821bc3b345f6890f01825
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/network/kernel/qdnslookup/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/other/gestures/BLACKLIST | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/network/kernel/qdnslookup/BLACKLIST b/tests/auto/network/kernel/qdnslookup/BLACKLIST new file mode 100644 index 0000000000..f07a8ce9a3 --- /dev/null +++ b/tests/auto/network/kernel/qdnslookup/BLACKLIST @@ -0,0 +1,2 @@ +[lookup] +* diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 9a821deefe..08e9e05463 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -1193,7 +1193,8 @@ void tst_QLocalSocket::writeToClientAndDisconnect() void tst_QLocalSocket::debug() { // Make sure this compiles - QTest::ignoreMessage(QtDebugMsg, "QLocalSocket::ConnectionRefusedError QLocalSocket::UnconnectedState"); + if (QLoggingCategory::defaultCategory()->isDebugEnabled()) + QTest::ignoreMessage(QtDebugMsg, "QLocalSocket::ConnectionRefusedError QLocalSocket::UnconnectedState"); qDebug() << QLocalSocket::ConnectionRefusedError << QLocalSocket::UnconnectedState; } diff --git a/tests/auto/other/gestures/BLACKLIST b/tests/auto/other/gestures/BLACKLIST index 1d89178fe5..169117b36a 100644 --- a/tests/auto/other/gestures/BLACKLIST +++ b/tests/auto/other/gestures/BLACKLIST @@ -1,2 +1,6 @@ [] rhel-7.4 +[customGesture] +# QTBUG-67254 +ubuntu +opensuse |