From 1ae9caec79aea647d0f10d3324831b5b8bf6d932 Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Sun, 18 Dec 2022 16:11:05 +0200
Subject: [PATCH] Skip tst_qconcurrentrun completely if running under an
 emulator

Task-number: QTBUG-106906
Change-Id: I1836f5be42528c71470c2cd6509f7125feb47691
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 413798cc01a3a2499c1f7683acdb68fd3466aae1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../qtconcurrentrun/tst_qtconcurrentrun.cpp           | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index f5925d95837..179cf2b0062 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -18,6 +18,7 @@ class tst_QtConcurrentRun: public QObject
 {
     Q_OBJECT
 private slots:
+    void initTestCase();
     void runLightFunction();
     void runHeavyFunction();
     void returnValue();
@@ -85,6 +86,13 @@ void heavy()
     qDebug("done function");
 }
 
+void tst_QtConcurrentRun::initTestCase()
+{
+    // proxy check for QEMU; catches slightly more though
+    if (QTestPrivate::isRunningArmOnX86())
+        QSKIP("Runs into spurious crashes on QEMU -- QTBUG-106906");
+}
+
 void tst_QtConcurrentRun::runLightFunction()
 {
     qDebug("starting function");
@@ -701,9 +709,6 @@ static void runFunction()
 
 void tst_QtConcurrentRun::pollForIsFinished()
 {
-    // proxy check for QEMU; catches slightyl more though
-    if (QTestPrivate::isRunningArmOnX86())
-        QSKIP("Runs into spurious crashes on QEMU -- QTBUG-106906");
     const int numThreads = std::max(4, 2 * QThread::idealThreadCount());
     QThreadPool::globalInstance()->setMaxThreadCount(numThreads);