From 71eef476d789bf94602006cc2c9a44ba384f988e Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 12 Feb 2021 08:59:00 +0200
Subject: tst_qprocess: enable test again for cross-compilations

All test cases pass with QEMU.

Fixes: QTBUG-85287
Fixes: QTBUG-67760
Pick-to: 6.1
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>
---
 tests/auto/corelib/io/CMakeLists.txt               | 7 +------
 tests/auto/corelib/io/qprocess/test/CMakeLists.txt | 1 -
 tests/auto/corelib/io/qprocess/tst_qprocess.cpp    | 3 ---
 3 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'tests')

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
-- 
cgit v1.2.3