summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/io/CMakeLists.txt7
-rw-r--r--tests/auto/corelib/io/qprocess/test/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qprocess/tst_qprocess.cpp3
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