From 826a98cff1cd92d8b87ddd0df7f9a5b0828ac000 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 13 Jul 2022 11:40:38 +0200 Subject: [PATCH] QProcess: skip processesInMultipleThreads test on emulators The test has timed out when run on ARM in qemu. We start more threads than the ideal count, which is likely too much for the emulator when not running the native architecture. Pick-to: 6.4 Change-Id: I42e11945070646551e77c10618df762a4bffc8ba Reviewed-by: Thiago Macieira --- tests/auto/corelib/io/qprocess/test/CMakeLists.txt | 1 + tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt index 9cd8fee6e8..b8efc6492e 100644 --- a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt @@ -9,6 +9,7 @@ qt_internal_add_test(tst_qprocess PUBLIC_LIBRARIES Qt::CorePrivate Qt::Network + Qt::TestPrivate ) ## Build assorted sub-programs called from the test: diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 674e232eca..a2b3dfc154 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -23,6 +23,8 @@ # include #endif +#include + #include typedef void (QProcess::*QProcessErrorSignal)(QProcess::ProcessError); @@ -1223,6 +1225,9 @@ void tst_QProcess::processInAThread() void tst_QProcess::processesInMultipleThreads() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Test is too slow to run on emulator"); + #if defined(Q_OS_QNX) QSKIP("QNX: Large amount of threads is unstable and do not finish in given time"); #endif