diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-02-12 08:59:00 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-16 07:35:29 +0000 |
| commit | cc4bcf94e0f33dc72b5cfeb01cd0e6f647925c88 (patch) | |
| tree | a14491f19bc09955d91444fc20bb84b9d378d25b /tests/auto/corelib | |
| parent | 9e2a85b2a204a81566294c3b233eb57446901538 (diff) | |
tst_qprocess: enable test again for cross-compilations
All test cases pass with QEMU.
Fixes: QTBUG-85287
Fixes: QTBUG-67760
Change-Id: I188d70c05f6d858e17f1099d3c02862ea9b2a2ab
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 71eef476d789bf94602006cc2c9a44ba384f988e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/io/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qprocess/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 3 |
3 files changed, 1 insertions, 10 deletions
diff --git a/tests/auto/corelib/io/CMakeLists.txt b/tests/auto/corelib/io/CMakeLists.txt index 3ec6665335..4bdb03ff99 100644 --- a/tests/auto/corelib/io/CMakeLists.txt +++ b/tests/auto/corelib/io/CMakeLists.txt @@ -42,12 +42,7 @@ if(TARGET Qt::Network) add_subdirectory(qiodevice) endif() if(QT_FEATURE_process AND TARGET Qt::Network AND NOT ANDROID) - # special case begin - # QTBUG-85287: Hangs on qemu armv7 config - if(NOT CMAKE_CROSSCOMPILING) - add_subdirectory(qprocess) - endif() - # special case end + add_subdirectory(qprocess) endif() if(QT_FEATURE_process) add_subdirectory(qprocess-noapplication) diff --git a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt index 75cddf41a8..086a5663e8 100644 --- a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt @@ -11,7 +11,6 @@ qt_internal_add_test(tst_qprocess PUBLIC_LIBRARIES Qt::CorePrivate Qt::Network - Qt::TestPrivate ) #### Keys ignored in scope 1:.:.:test.pro:<TRUE>: diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 41172a10dd..82a2cb1254 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -30,7 +30,6 @@ #include <QTest> #include <QTestEventLoop> #include <QSignalSpy> -#include <QtTest/private/qemulationdetector_p.h> #include <QtCore/QProcess> #include <QtCore/QDir> @@ -1236,8 +1235,6 @@ void tst_QProcess::processInAThread() void tst_QProcess::processesInMultipleThreads() { - if (QTestPrivate::isRunningArmOnX86()) - QSKIP("Flakily hangs in QEMU. QTBUG-67760"); for (int i = 0; i < 10; ++i) { // run from 1 to 10 threads, but run at least some tests // with more threads than the ideal |