diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-13 11:40:38 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-13 21:02:01 +0200 |
commit | 826a98cff1cd92d8b87ddd0df7f9a5b0828ac000 (patch) | |
tree | bd3f09e23981c7389128ef6657063b0ac51255c7 /tests/auto/corelib/io | |
parent | 4ae85ae441ea683cbc67fdc1d2bdfcf66fa00bc3 (diff) |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/io')
-rw-r--r-- | tests/auto/corelib/io/qprocess/test/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
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 <private/qcore_unix_p.h> #endif +#include <QtTest/private/qemulationdetector_p.h> + #include <stdlib.h> 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 |