summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2021-01-11 16:20:58 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2021-01-22 09:00:24 +0200
commit946facb1ae5ed1cf54bb5141bc5ca20ddbb26755 (patch)
tree1c9336a43228462f79cce92dd5ae60273140df84
parentee89f3a6e39e53013f132f3721332d433817a546 (diff)
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 <assam.boudjelthia@qt.io>
-rw-r--r--tests/auto/gui/text/qfont/CMakeLists.txt2
-rw-r--r--tests/auto/gui/text/qfont/tst_qfont.cpp5
2 files changed, 7 insertions, 0 deletions
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 <qwidget.h>
#endif
#include <qlist.h>
+#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);