From de9caf16fe125b7b139287936eda555614648534 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 5 Aug 2011 11:44:39 +1000 Subject: test: mark tst_qfontdatabase qpa failures as expected Task-number: QTBUG-20754 Change-Id: Ibb57e7724d453b390a8e37e62f6e5cf2691f48f8 Reviewed-on: http://codereview.qt.nokia.com/2654 Reviewed-by: Qt Sanity Bot Reviewed-by: Sergio Ahumada --- tests/auto/qfontdatabase/tst_qfontdatabase.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests') diff --git a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp index 735c7e4350..1df61d0a06 100644 --- a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp @@ -160,6 +160,13 @@ void tst_QFontDatabase::fixedPitch() if (!fdb.families().contains(font)) QSKIP( "Font not installed", SkipSingle); +#ifdef Q_WS_QPA + if (fixedPitch) { + // fixedPitch() never returns true on qpa + QEXPECT_FAIL("", "QTBUG-20754 fails on qpa", Abort); + } +#endif + QCOMPARE(fdb.isFixedPitch(font), fixedPitch); QFont qfont(font); @@ -229,6 +236,10 @@ void tst_QFontDatabase::addAppFont() QFontDatabase db; +#ifdef Q_WS_QPA + QEXPECT_FAIL("memory font", "QTBUG-20754 fails on qpa", Abort); +#endif + const QStringList oldFamilies = db.families(); QVERIFY(!oldFamilies.isEmpty()); @@ -262,6 +273,10 @@ void tst_QFontDatabase::addAppFont() const QStringList addedFamilies = QFontDatabase::applicationFontFamilies(id); QVERIFY(!addedFamilies.isEmpty()); +#ifdef Q_WS_QPA + QEXPECT_FAIL("font file", "QTBUG-20754 fails on qpa", Abort); +#endif + const QStringList newFamilies = db.families(); QVERIFY(!newFamilies.isEmpty()); QVERIFY(newFamilies.count() >= oldFamilies.count()); -- cgit v1.2.3