From ec722b9132657f8884c5a813592af4d0871ad03f Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 16 Nov 2023 09:20:19 +0100 Subject: [PATCH] DeviceShell tests: Use ProcessLauncher for shell process It looks like after recent switch to QProcess impl for Utils::Process, the DeviceShell::m_shellProcess blocks in DeviceShell::installShellScript() on a call to m_shellProcess->waitForReadyRead(5000). Until it's solved, bring back the ProcessLauncher impl for the shell process to unlock the CI tests. Amends a53dfaf623c3167ae07e8360e7cf9599e2904f24 Change-Id: I085ea5c1ae4f169c7c77acb8702ed48de0a95bac Reviewed-by: Christian Stenger --- src/libs/utils/deviceshell.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/utils/deviceshell.cpp b/src/libs/utils/deviceshell.cpp index 6d99d399841..f459e33d255 100644 --- a/src/libs/utils/deviceshell.cpp +++ b/src/libs/utils/deviceshell.cpp @@ -163,6 +163,8 @@ CommandLine DeviceShell::createFallbackCommand(const CommandLine &cmd) expected_str DeviceShell::start() { m_shellProcess = std::make_unique(); + // FIXME: This shouldn't be needed, it's a temporary workaround. + m_shellProcess->setProcessImpl(ProcessImpl::ProcessLauncher); connect(m_shellProcess.get(), &Process::done, m_shellProcess.get(), [this] { emit done(m_shellProcess->resultData()); }); connect(&m_thread, &QThread::finished, m_shellProcess.get(), [this] { closeShellProcess(); }, Qt::DirectConnection);