diff options
| -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 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); |