From af19cbc8f33af933a3a4e2d16daac84acbad94be Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 10 Jul 2013 14:08:52 +0200 Subject: [PATCH] test: Replace QSKIP with QEXPECT_FAIL in tst_qwindow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is better to mark a test as XFAIL so we get an error whenever it gets fixed. Task-number: QTBUG-23059 Change-Id: I0f2f491645c261bf0e735dde6a16d8e90e0b17a0 Reviewed-by: Tony Sarajärvi Reviewed-by: Shawn Rutledge --- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index d34ab069c3f..5d4475a2529 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -170,13 +170,6 @@ void tst_QWindow::eventOrderOnShow() void tst_QWindow::positioning() { -#ifdef Q_OS_MAC - // the fullscreen animation delay on OS X Lion also causes failures in - // the isActive() test below, so it's best to just skip it for now - QSKIP("Multiple failures in this test on Mac OS X, see QTBUG-23059"); -#endif - - if (!QGuiApplicationPrivate::platformIntegration()->hasCapability( QPlatformIntegration::NonFullScreenWindows)) { QSKIP("This platform does not support non-fullscreen windows"); @@ -210,6 +203,9 @@ void tst_QWindow::positioning() window.setWindowState(Qt::WindowFullScreen); QCoreApplication::processEvents(); +#ifdef Q_OS_MACX + QEXPECT_FAIL("", "Multiple failures in this test on Mac OS X, see QTBUG-23059", Abort); +#endif QTRY_COMPARE(window.received(QEvent::Resize), 2); window.setWindowState(Qt::WindowNoState);