From 6dbaf9f536a3b02f371bdb4ce6302232f1789172 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 4 Apr 2012 12:16:40 +0200 Subject: Don't ignore tst_QWindow on Mac OS X QTBUG-23059 only affects 2 test functions, not the whole test. XFAIL the 2 failing tests. Change-Id: I87086a9ec573362625bc090038dfd7c79aeb9426 Reviewed-by: Jason McDonald --- tests/auto/gui/kernel/qwindow/qwindow.pro | 3 --- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/kernel/qwindow/qwindow.pro b/tests/auto/gui/kernel/qwindow/qwindow.pro index 363f7dd92e..e419a10440 100644 --- a/tests/auto/gui/kernel/qwindow/qwindow.pro +++ b/tests/auto/gui/kernel/qwindow/qwindow.pro @@ -4,6 +4,3 @@ TARGET = tst_qwindow QT += core-private gui-private testlib SOURCES += tst_qwindow.cpp - -mac: CONFIG += insignificant_test # QTBUG-23059 - diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index a75e1cb054..7bbcb8db7d 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -139,6 +139,9 @@ void tst_QWindow::positioning() QCOMPARE(window.geometry(), geometry); window.show(); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "This test fails on Mac OS X, see QTBUG-23059", Abort); +#endif QTRY_COMPARE(window.received(QEvent::Resize), 1); QTRY_COMPARE(window.received(QEvent::Map), 1); @@ -188,6 +191,9 @@ void tst_QWindow::isActive() window.setGeometry(80, 80, 40, 40); window.show(); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "This test fails on Mac OS X, see QTBUG-23059", Abort); +#endif QTRY_COMPARE(window.received(QEvent::Map), 1); QTRY_COMPARE(window.received(QEvent::Resize), 1); QTRY_VERIFY(QGuiApplication::focusWindow() == &window); -- cgit v1.2.3