From b6cf486816fe5323d8aae341838e78b21d2d5d4c Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 17 Apr 2012 22:18:56 +1000 Subject: Re-enable QTextScriptEngine test. The test has two stable failures. Mark these with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-23064 Change-Id: Ibb607ac252a6690d0d37f650a5ae41e5e2a681a2 Reviewed-by: Bradley T. Hughes --- tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp') diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp index d566f0a20d..6f7748b79a 100644 --- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp @@ -1178,6 +1178,7 @@ void tst_QTextScriptEngine::combiningMarks_qtbug15675() e->shape(0); QVERIFY(e->layoutData->items[0].num_glyphs == 4); + QEXPECT_FAIL("", "QTBUG-23064", Abort); QVERIFY(e->layoutData->glyphLayout.advances_y[2] > 0); #elif defined(Q_WS_X11) QFontDatabase db; @@ -1317,6 +1318,9 @@ void tst_QTextScriptEngine::thaiWithZWJ() QCOMPARE(logClusters[i], ushort(i)); for (int i = 0; i < 10; i++) QCOMPARE(logClusters[i+7], ushort(0)); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23064", Abort); +#endif QCOMPARE(logClusters[17], ushort(1)); // The only characters that we should be hiding are the ZWJ and ZWNJ characters in position 1 -- cgit v1.2.3