1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qprocess: enable test again for cross-compilations

Browse Source 
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>
This commit is contained in:
Samuli Piippo 2021-02-12 08:59:00 +02:00 committed by Qt Cherry-pick Bot
parent 9e2a85b2a2
commit cc4bcf94e0
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/auto/corelib/io/CMakeLists.txt
View File

@ -42,12 +42,7 @@ if(TARGET Qt::Network)
add_subdirectory(qiodevice) add_subdirectory(qiodevice)
endif() endif()
if(QT_FEATURE_process AND TARGET Qt::Network AND NOT ANDROID) 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) add_subdirectory(qprocess)
endif()
# special case end
endif() endif()
if(QT_FEATURE_process) if(QT_FEATURE_process)
add_subdirectory(qprocess-noapplication) add_subdirectory(qprocess-noapplication)

1
tests/auto/corelib/io/qprocess/test/CMakeLists.txt
View File

@ -11,7 +11,6 @@ qt_internal_add_test(tst_qprocess
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::Network Qt::Network
Qt::TestPrivate
) )
#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: #### Keys ignored in scope 1:.:.:test.pro:<TRUE>:

3
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
View File

@ -30,7 +30,6 @@
#include <QTest> #include <QTest>
#include <QTestEventLoop> #include <QTestEventLoop>
#include <QSignalSpy> #include <QSignalSpy>
#include <QtTest/private/qemulationdetector_p.h>
#include <QtCore/QProcess> #include <QtCore/QProcess>
#include <QtCore/QDir> #include <QtCore/QDir>
@ -1236,8 +1235,6 @@ void tst_QProcess::processInAThread()
void tst_QProcess::processesInMultipleThreads() void tst_QProcess::processesInMultipleThreads()
{ {
if (QTestPrivate::isRunningArmOnX86())
QSKIP("Flakily hangs in QEMU. QTBUG-67760");
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
// run from 1 to 10 threads, but run at least some tests // run from 1 to 10 threads, but run at least some tests
// with more threads than the ideal // with more threads than the ideal