diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-17 21:36:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 08:06:52 +0200 |
| commit | 14ba6240bb007c7cda6e034f619fd7715a44e7d7 (patch) | |
| tree | 761f6ed10c2228c16530298201b643bbfd333e67 /tests/auto/gui/text | |
| parent | 0bc02fd0d61d1e4aed9b39890d28975dff30e822 (diff) | |
Re-enable QFontDatabase test on Mac OS X.
This test has one stable failure on Mac. Mark that failure with
QEXPECT_FAIL so that the rest of the test can be used by CI to catch
regressions.
Also, change the failing QVERIFY to QCOMPARE so that the mismatching
QStringList values will appear in the test output.
Task-number: QTBUG-23062
Change-Id: Icb0cccfe0bd5bc74a6a2c1ddba89c1f55f5e64de
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'tests/auto/gui/text')
| -rw-r--r-- | tests/auto/gui/text/qfontdatabase/qfontdatabase.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro index c853aaa100..8be6fe22d1 100644 --- a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro +++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro @@ -9,5 +9,3 @@ wince* { additionalFiles.path = . DEPLOYMENT += additionalFiles } - -mac: CONFIG += insignificant_test # QTBUG-23062 diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index 7a1cc53c57..9510b9719a 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -265,7 +265,10 @@ void tst_QFontDatabase::addAppFont() QVERIFY(QFontDatabase::removeApplicationFont(id)); QCOMPARE(fontDbChangedSpy.count(), 2); - QVERIFY(db.families() == oldFamilies); +#ifdef Q_OS_MAC + QEXPECT_FAIL("font file", "QTBUG-23062", Continue); +#endif + QCOMPARE(db.families(), oldFamilies); } QTEST_MAIN(tst_QFontDatabase) |