From 946facb1ae5ed1cf54bb5141bc5ca20ddbb26755 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 11 Jan 2021 16:20:58 +0200 Subject: tst_qfont: expect failure on font testcase for QEMU ARMv7 FontConfig related tests fail on ARMv7 QEMU. Task-number: QTQAINFRA-4127 Change-Id: I3202f660d12d09a65bc50747d679921b6dfa75f8 Reviewed-by: Assam Boudjelthia --- tests/auto/gui/text/qfont/CMakeLists.txt | 2 ++ tests/auto/gui/text/qfont/tst_qfont.cpp | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt index eb1f9747b2..32cbed7aaf 100644 --- a/tests/auto/gui/text/qfont/CMakeLists.txt +++ b/tests/auto/gui/text/qfont/CMakeLists.txt @@ -11,6 +11,8 @@ qt_internal_add_test(tst_qfont Qt::CorePrivate Qt::Gui Qt::GuiPrivate + INCLUDE_DIRECTORIES + ../../../../shared ) # Resources: diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index d1a202ace2..efd1215d70 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -41,6 +41,7 @@ #include #endif #include +#include "emulationdetector.h" class tst_QFont : public QObject { @@ -576,6 +577,10 @@ void tst_QFont::defaultFamily() break; } } +#ifdef Q_PROCESSOR_ARM_32 + if (EmulationDetector::isRunningArmOnX86()) + QEXPECT_FAIL("", "Fails on ARMv7 QEMU (QTQAINFRA-4127)", Continue); +#endif #ifdef Q_OS_ANDROID QEXPECT_FAIL("serif", "QTBUG-69215", Continue); -- cgit v1.2.3