From a594e5cfc8098c236f113e292938c791d42a3103 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 18 Apr 2012 00:26:36 +1000 Subject: [PATCH] Remove insignification from QFocusEvent test on Mac OS X. This test has one stable failure. Mark that failure with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-22815 Change-Id: I38445b659235076b00d9dd82d2a824d1caa1439b Reviewed-by: Bradley T. Hughes --- tests/auto/other/qfocusevent/qfocusevent.pro | 1 - tests/auto/other/qfocusevent/tst_qfocusevent.cpp | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/other/qfocusevent/qfocusevent.pro b/tests/auto/other/qfocusevent/qfocusevent.pro index ee2cf22a6a..5f799291c6 100644 --- a/tests/auto/other/qfocusevent/qfocusevent.pro +++ b/tests/auto/other/qfocusevent/qfocusevent.pro @@ -2,4 +2,3 @@ CONFIG += testcase TARGET = tst_qfocusevent QT += widgets testlib SOURCES += tst_qfocusevent.cpp -mac: CONFIG += insignificant_test # QTBUG-22815 diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp index 946003fc72..05a609c8a6 100644 --- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp @@ -377,6 +377,9 @@ void tst_QFocusEvent::checkReason_ActiveWindow() #if defined(Q_OS_IRIX) QEXPECT_FAIL("", "IRIX requires explicit activateWindow(), so this test does not make any sense.", Abort); +#endif +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-22815", Abort); #endif QTRY_VERIFY(childFocusWidgetOne->focusInEventRecieved); QVERIFY(childFocusWidgetOne->focusInEventGotFocus);