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 <bradley.hughes@nokia.com>
This commit is contained in:
Jason McDonald 2012-04-17 22:18:56 +10:00 committed by Qt by Nokia
parent 14ba6240bb
commit b6cf486816
2 changed files with 4 additions and 2 deletions

View File

@ -6,5 +6,3 @@ QT += core-private gui-private testlib
HEADERS +=
SOURCES += tst_qtextscriptengine.cpp
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
mac: CONFIG += insignificant_test # QTBUG-23064

View File

@ -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