summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2012-02-21 11:03:00 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-21 04:17:51 +0100
commita30f42ddb3701ad90e7f0bb89d4ef435af6b5cf2 (patch)
tree067d0d36827802a7972decc95e6f1cb4a49cb719
parentca1aa0da03aaf34aac1470bab52ce835a0392bef (diff)
Flag two tests (Win+A, Simon+G) in parseString as expect fail on OSX.
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>
-rw-r--r--tests/auto/gui/kernel/qkeysequence/qkeysequence.pro2
-rw-r--r--tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro
index c6eb02919e..1e0baafd09 100644
--- a/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro
+++ b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro
@@ -7,5 +7,3 @@ QT += core-private gui-private
SOURCES += tst_qkeysequence.cpp
RESOURCES += qkeysequence.qrc
-
-mac: CONFIG += insignificant_test # QTBUG-23058
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index eed7977c82..29588e2ee9 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -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 );
}