diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-07-12 11:51:06 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-06 04:12:53 (GMT) |
| commit | f07d3f9184b9d5394c5a44f4788711c781a2ea49 (patch) | |
| tree | 9372db0e3200a27d2b4bb77a1273b7b68607d721 /tests/auto | |
| parent | 37494c9a26e9734ec8ef1a7419ea6f9ef22a4b79 (diff) | |
| download | Qt-f07d3f9184b9d5394c5a44f4788711c781a2ea49.zip Qt-f07d3f9184b9d5394c5a44f4788711c781a2ea49.tar.gz Qt-f07d3f9184b9d5394c5a44f4788711c781a2ea49.tar.bz2 | |
tests: Re-enable QTextScriptEngine test.
The test has four stable failures. Mark these with QEXPECT_FAIL and
re-enable the test.
Task-number: QTBUG-26495
Change-Id: I9897c4008bd925402f18af87988feedcdd729062
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qtextscriptengine/qtextscriptengine.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/qtextscriptengine/qtextscriptengine.pro b/tests/auto/qtextscriptengine/qtextscriptengine.pro index 3e4a2da..f66de22 100644 --- a/tests/auto/qtextscriptengine/qtextscriptengine.pro +++ b/tests/auto/qtextscriptengine/qtextscriptengine.pro @@ -5,5 +5,3 @@ QT += testlib SOURCES += tst_qtextscriptengine.cpp HEADERS += INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - -CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp index 730ae2e..f44087d 100644 --- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp @@ -565,6 +565,7 @@ void tst_QTextScriptEngine::gurmukhi() const ShapeTable *s = shape_table; while (s->unicode[0]) { + QEXPECT_FAIL("", "QTBUG-26495", Abort); QVERIFY( shaping(f, s) ); ++s; } @@ -1305,6 +1306,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_WIN + QEXPECT_FAIL("", "QTBUG-26495", Abort); +#endif QCOMPARE(logClusters[17], ushort(1)); // The only characters that we should be hiding are the ZWJ and ZWNJ characters in position 1 @@ -1346,6 +1350,7 @@ void tst_QTextScriptEngine::thaiSaraAM() e->width(0, s.length()); //force itemize and shape QCOMPARE(e->layoutData->items.size(), 1); + QEXPECT_FAIL("", "QTBUG-26495", Abort); QCOMPARE(e->layoutData->items[0].num_glyphs, ushort(28)); QCOMPARE(sizeof(clusterNumber) / sizeof(unsigned short), (size_t)s.size()); @@ -1379,6 +1384,11 @@ void tst_QTextScriptEngine::thaiMultipleVowels() for (int i = 0; i < e->layoutData->items.size(); i++) for (int j = 0; j < e->layoutData->items[i].num_glyphs; j++) { bool isZWJ = k%401 == 200; +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) + if ((bool)e->layoutData->glyphLayout.attributes[k].dontPrint != isZWJ) { + QEXPECT_FAIL("", "QTBUG-26495", Abort); + } +#endif QCOMPARE((bool)e->layoutData->glyphLayout.attributes[k++].dontPrint, isZWJ); } } |