diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-08-03 00:34:31 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-03 09:30:06 +0000 |
| commit | e5cdb966bf83e780fe3358f840f14acc24db4d11 (patch) | |
| tree | 641980bc070953220395d70da8d98d11b6e6db32 | |
| parent | 8853f2bad4c81bf7bc135da93da7a48d6936365d (diff) | |
Ignore tests that fail on OpenNebula
These tests need fixing, but they are already partially blacklisted
and need investigation once the switch is completed.
Task-number: QTQAINFRA-1292
Task-number: QTQAINFRA-1355
Task-number: QTQAINFRA-1362
Change-Id: Ic50d0c4a01ee7e72be1129d418eff244ba783185
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/other/macnativeevents/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST index 1443359377..9ffcf73d64 100644 --- a/tests/auto/gui/kernel/qwindow/BLACKLIST +++ b/tests/auto/gui/kernel/qwindow/BLACKLIST @@ -19,3 +19,7 @@ ubuntu-16.04 osx [modalWindowModallity] osx +[visibility] +osx-10.11 ci +osx-10.12 ci + diff --git a/tests/auto/other/macnativeevents/BLACKLIST b/tests/auto/other/macnativeevents/BLACKLIST index 674e62144a..1bc530ecc8 100644 --- a/tests/auto/other/macnativeevents/BLACKLIST +++ b/tests/auto/other/macnativeevents/BLACKLIST @@ -21,6 +21,7 @@ osx osx [testMouseDragToNonClientArea] osx +osx-10.12 ci # The following key tests fail after switching to synchronous # expose events, and we don't know why yet. QTBUG-62042 [testKeyPressOnToplevel] @@ -34,6 +35,8 @@ osx # QTQAINFRA-1292 [testPushButtonPressRelease] osx-10.11 ci +osx-10.12 ci + # QTQAINFRA-1292 [testModifierCtrlWithDontSwapCtrlAndMeta] osx-10.12 ci diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index d6c4841b22..4441337f6e 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -185,6 +185,12 @@ void tst_QMessageBox::cleanup() void tst_QMessageBox::sanityTest() { +#if defined(Q_OS_MACOS) + if (QSysInfo::productVersion() == QLatin1String("10.12")) { + QSKIP("Test hangs on macOS 10.12 -- QTQAINFRA-1362"); + return; + } +#endif QMessageBox msgBox; msgBox.setText("This is insane"); for (int i = 0; i < 10; i++) |