summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2022-11-30 09:41:55 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-11-30 17:23:28 +0000
commit518118991f0ab96e4764b65a59b5db2f89e75f42 (patch)
tree015628ca411a3158677a9f4f5112fdb8195a0d28
parentd63612a8acbbe4391fb3dbfa1dccf4c70fc5774a (diff)
Temporarily skip tst_qtcuncurrentrun::pollForIsFinished in emulator
This test causes instability in the CI, but so far nobody could reproduce it outside of that specific CI environment. Skip it for now, and investigate the root cause later. Task-number: QTBUG-106906 Change-Id: Idbbc560236ac475fcb4fdd5980397393f7a95474 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> (cherry picked from commit fbf55619daea26dadb600100e87da48eef3dc714) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt1
-rw-r--r--tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp5
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt
index 9f3b60481d..540a360319 100644
--- a/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_test(tst_qtconcurrentrun
tst_qtconcurrentrun.cpp
PUBLIC_LIBRARIES
Qt::Concurrent
+ Qt::TestPrivate
)
## Scopes:
diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index 97e13a2aa8..f5925d9583 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -10,6 +10,8 @@
#include <QTimer>
#include <QFutureSynchronizer>
+#include <QtTest/private/qemulationdetector_p.h>
+
using namespace QtConcurrent;
class tst_QtConcurrentRun: public QObject
@@ -699,6 +701,9 @@ 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);