diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-17 22:18:56 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 08:07:03 +0200 |
| commit | b6cf486816fe5323d8aae341838e78b21d2d5d4c (patch) | |
| tree | 7e75b1085441721cf1ffe83d86e4c0eeade6203b /tests/auto/gui | |
| parent | 14ba6240bb007c7cda6e034f619fd7715a44e7d7 (diff) | |
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>
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro index 516fa67f11..6dcb1b44a0 100644 --- a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro +++ b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro @@ -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 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 |