diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-12-22 15:22:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-09 20:25:00 +0000 |
| commit | f9a1ccf19c09cfe842cc2e6d661c4c284387ed2f (patch) | |
| tree | 6743d2e96ee177aab3904c23e3e7200919205a14 /tests | |
| parent | a5ad605dfec2ab4e921d5c5843b23916ed5ae3bf (diff) | |
macOS: Blacklist modalWindowEnterEventOnHide_QTBUG35109 instead of skipping
We have the ability to blacklist tests for CI runs now.
Task-number: QTBUG-35109
Change-Id: I8590e83faba764dce2d52e8c62e2e2c63f7bf219
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST index 1a4885b895..f86388345b 100644 --- a/tests/auto/gui/kernel/qwindow/BLACKLIST +++ b/tests/auto/gui/kernel/qwindow/BLACKLIST @@ -15,6 +15,7 @@ ubuntu-14.04 [modalWindowEnterEventOnHide_QTBUG35109] ubuntu-14.04 ubuntu-16.04 +osx ci [modalDialogClosingOneOfTwoModal] osx [modalWindowModallity] diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 6452b9ecd0..5145c22356 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -2000,9 +2000,6 @@ void tst_QWindow::modalWindowPosition() #ifndef QT_NO_CURSOR void tst_QWindow::modalWindowEnterEventOnHide_QTBUG35109() { - if (QGuiApplication::platformName() == QLatin1String("cocoa")) - QSKIP("This test fails on OS X on CI"); - if (isPlatformOffscreenOrMinimal()) QSKIP("Can't test window focusing on offscreen/minimal"); |