qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tor Arne Vestbø 2017-12-22 15:22:10 +01:00 committed by Liang Qi
parent a5ad605dfe
commit f9a1ccf19c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/gui/kernel/qwindow/BLACKLIST
View File

@ -15,6 +15,7 @@ ubuntu-14.04
[modalWindowEnterEventOnHide_QTBUG35109] [modalWindowEnterEventOnHide_QTBUG35109]
ubuntu-14.04 ubuntu-14.04
ubuntu-16.04 ubuntu-16.04
osx ci
[modalDialogClosingOneOfTwoModal] [modalDialogClosingOneOfTwoModal]
osx osx
[modalWindowModallity] [modalWindowModallity]

3
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
View File

@ -2000,9 +2000,6 @@ void tst_QWindow::modalWindowPosition()
#ifndef QT_NO_CURSOR #ifndef QT_NO_CURSOR
void tst_QWindow::modalWindowEnterEventOnHide_QTBUG35109() void tst_QWindow::modalWindowEnterEventOnHide_QTBUG35109()
{ {
if (QGuiApplication::platformName() == QLatin1String("cocoa"))
QSKIP("This test fails on OS X on CI");
if (isPlatformOffscreenOrMinimal()) if (isPlatformOffscreenOrMinimal())
QSKIP("Can't test window focusing on offscreen/minimal"); QSKIP("Can't test window focusing on offscreen/minimal");