From d40f19af7547e1e9364c993d8f4b1bfb32ee80c2 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 1 Nov 2023 09:07:07 +0100 Subject: [PATCH] Skip mixedScript test on platforms with no Hangul font This test depends on the system actually supporting Korean text, otherwise it will just return a single glyph run with the digit and the missing glyph symbol. Pick-to: 6.5 Fixes: QTBUG-118649 Change-Id: I54e55414ae4ba0a6328c7c3a57ae8840d3b123b1 Reviewed-by: Jani Heikkinen Reviewed-by: Qt CI Bot (cherry picked from commit c5b3fd134b9e88322379fb34616662690c7acbb8) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/gui/text/qglyphrun/BLACKLIST | 7 ------- tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 tests/auto/gui/text/qglyphrun/BLACKLIST diff --git a/tests/auto/gui/text/qglyphrun/BLACKLIST b/tests/auto/gui/text/qglyphrun/BLACKLIST deleted file mode 100644 index 86e857fb234..00000000000 --- a/tests/auto/gui/text/qglyphrun/BLACKLIST +++ /dev/null @@ -1,7 +0,0 @@ -# QTBUG-68860 -[mixedScripts] -ubuntu-18.04 -ubuntu-20.04 -ubuntu-22.04 -# QTBUG-100928 -qnx diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp index 9bc93919895..7d7d16c300c 100644 --- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp +++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp @@ -564,6 +564,9 @@ void tst_QGlyphRun::boundingRect() void tst_QGlyphRun::mixedScripts() { + if (QFontDatabase::families(QFontDatabase::Korean).isEmpty()) + QSKIP("This test requires support for Hangul text"); + QString s; s += QChar(0x31); // The character '1' s += QChar(0xbc14); // Hangul character