Flag two tests (Win+A, Simon+G) in parseString as expect fail on OSX.
authorToby Tomkins <toby.tomkins@nokia.com>
Tue, 21 Feb 2012 01:03:00 +0000 (11:03 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 21 Feb 2012 03:17:51 +0000 (04:17 +0100)
Remove previously defined insignificant test flag as the number of
tests failing has been reduced.

Task-number: QTBUG-24406
Task-number: QTBUG-23058

Change-Id: I01b41f30469cf7a440e21195e105cb30a8db76e2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
tests/auto/gui/kernel/qkeysequence/qkeysequence.pro
tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp

index c6eb029..1e0baaf 100644 (file)
@@ -7,5 +7,3 @@ QT += core-private gui-private
 SOURCES  += tst_qkeysequence.cpp
 
 RESOURCES += qkeysequence.qrc
-
-mac: CONFIG += insignificant_test # QTBUG-23058
index eed7977..29588e2 100644 (file)
@@ -576,6 +576,11 @@ void tst_QKeySequence::parseString()
     QFETCH( QString, strSequence );
     QFETCH( QKeySequence, keycode );
 
+#ifdef Q_OS_MAC
+    QEXPECT_FAIL("Win+A", "QTBUG-24406 - This test fails on OSX", Abort);
+    QEXPECT_FAIL("Simon+G", "QTBUG-24406 - This test fails on OSX", Abort);
+#endif
+
     QCOMPARE( QKeySequence(strSequence).toString(), keycode.toString() );
     QVERIFY( QKeySequence(strSequence) == keycode );
 }