From 6dd15ef3f319ddadf6f721d59f67fde15f5cfd2b Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Tue, 18 Oct 2022 14:17:35 +0200
Subject: [PATCH] ProjectExplorer: Ensure working dir is reachable

Previously the working directory might not be reachable by
the executable.

This change fixes that by calling "ensureReachable", and
changing the path to an on-device path of the exectuable.

This also fixes the path when the Host is Windows, and
the build device is a unix type system by changing the paths
from e.g. "c:/..." to "/c/..."

Change-Id: I6c86e16c867bb654b6c2a4951d9f62fdb879298e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../projectexplorer/abstractprocessstep.cpp   | 23 +++++++++++++------
 .../projectexplorer/abstractprocessstep.h     |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 65b2518ba37..74919217996 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -152,7 +152,8 @@ bool AbstractProcessStep::init()
     if (d->m_process)
         return false;
 
-    setupProcessParameters(processParameters());
+    if (!setupProcessParameters(processParameters()))
+        return false;
 
     return true;
 }
@@ -233,7 +234,7 @@ ProcessParameters *AbstractProcessStep::processParameters()
     return &d->m_param;
 }
 
-void AbstractProcessStep::setupProcessParameters(ProcessParameters *params) const
+bool AbstractProcessStep::setupProcessParameters(ProcessParameters *params) const
 {
     params->setMacroExpander(macroExpander());
 
@@ -242,13 +243,21 @@ void AbstractProcessStep::setupProcessParameters(ProcessParameters *params) cons
         d->m_environmentModifier(env);
     params->setEnvironment(env);
 
-    if (d->m_workingDirectoryProvider)
-        params->setWorkingDirectory(d->m_workingDirectoryProvider());
-    else
-        params->setWorkingDirectory(buildDirectory());
-
     if (d->m_commandLineProvider)
         params->setCommandLine(d->m_commandLineProvider());
+
+    FilePath workingDirectory;
+    if (d->m_workingDirectoryProvider)
+        workingDirectory = d->m_workingDirectoryProvider();
+    else
+        workingDirectory = buildDirectory();
+
+    const FilePath executable = params->effectiveCommand();
+
+    QTC_ASSERT(executable.ensureReachable(workingDirectory), return false);
+    params->setWorkingDirectory(workingDirectory.onDevice(executable));
+
+    return true;
 }
 
 void AbstractProcessStep::Private::cleanUp(int exitCode, QProcess::ExitStatus status)
diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h
index 731bc7e89b5..47c8ccef1a2 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.h
+++ b/src/plugins/projectexplorer/abstractprocessstep.h
@@ -21,7 +21,7 @@ class PROJECTEXPLORER_EXPORT AbstractProcessStep : public BuildStep
 
 public:
     ProcessParameters *processParameters();
-    void setupProcessParameters(ProcessParameters *params) const;
+    bool setupProcessParameters(ProcessParameters *params) const;
 
     bool ignoreReturnValue() const;
     void setIgnoreReturnValue(bool b);