diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-11-30 09:41:55 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-11-30 18:01:47 +0100 |
| commit | fbf55619daea26dadb600100e87da48eef3dc714 (patch) | |
| tree | 9646861c1cd141f0338cf154b7997db0b9fca860 | |
| parent | ae7985b498e6c8cc86cca00209532ebbd794f9e8 (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.
Pick-to: 6.2 6.4
Task-number: QTBUG-106906
Change-Id: Idbbc560236ac475fcb4fdd5980397393f7a95474
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt index 63c863dfd51..8720c562269 100644 --- a/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt @@ -12,6 +12,7 @@ qt_internal_add_test(tst_qtconcurrentrun tst_qtconcurrentrun.cpp 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 97e13a2aa81..f5925d95837 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); |