AutoTest: Fix source file construction on Windows

Task-number: QTCREATORBUG-15667
Change-Id: I4d0e81a39a5031403d77fb3e2179ed17451346b4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/autotest/testconfiguration.cpp

@@ -28,6 +28,7 @@
 #include <cpptools/cppmodelmanager.h>
 #include <cpptools/projectinfo.h>
 
+#include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildtargetinfo.h>
 #include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/kitinformation.h>
@@ -115,6 +116,7 @@ void TestConfiguration::completeTestInformation()
     QString workDir;
     QString proFile = m_proFile;
     QString displayName;
+    QString buildDir;
     Project *targetProject = 0;
     Utils::Environment env;
     bool hasDesktopTarget = false;
@@ -140,6 +142,15 @@ void TestConfiguration::completeTestInformation()
         }
     }
 
+    if (targetProject) {
+        if (auto buildConfig = target->activeBuildConfiguration()) {
+            const QString buildBase = buildConfig->buildDirectory().toString();
+            const QString projBase = targetProject->projectDirectory().toString();
+            if (proFile.startsWith(projBase))
+                buildDir = QFileInfo(buildBase + proFile.mid(projBase.length())).absolutePath();
+        }
+    }
+
     QList<RunConfiguration *> rcs = target->runConfigurations();
     foreach (RunConfiguration *rc, rcs) {
         Runnable runnable = rc->runnable();
@@ -176,6 +187,7 @@ void TestConfiguration::completeTestInformation()
         setTargetFile(targetFile);
         setTargetName(targetName);
         setWorkingDirectory(workDir);
+        setBuildDirectory(buildDir);
         setEnvironment(env);
         setProject(project);
         setGuessedConfiguration(guessedRunConfiguration);
@@ -228,6 +240,11 @@ void TestConfiguration::setWorkingDirectory(const QString &workingDirectory)
     m_workingDir = workingDirectory;
 }
 
+void TestConfiguration::setBuildDirectory(const QString &buildDirectory)
+{
+    m_buildDir = buildDirectory;
+}
+
 void TestConfiguration::setDisplayName(const QString &displayName)
 {
     m_displayName = displayName;

src/plugins/autotest/testconfiguration.h

@@ -56,6 +56,7 @@ public:
     void setTargetName(const QString &targetName);
     void setProFile(const QString &proFile);
     void setWorkingDirectory(const QString &workingDirectory);
+    void setBuildDirectory(const QString &buildDirectory);
     void setDisplayName(const QString &displayName);
     void setEnvironment(const Utils::Environment &env);
     void setProject(ProjectExplorer::Project *project);
@@ -70,6 +71,7 @@ public:
     QString targetFile() const { return m_targetFile; }
     QString targetName() const { return m_targetName; }
     QString workingDirectory() const { return m_workingDir; }
+    QString buildDirectory() const { return m_buildDir; }
     QString displayName() const { return m_displayName; }
     Utils::Environment environment() const { return m_environment; }
     ProjectExplorer::Project *project() const { return m_project.data(); }
@@ -87,6 +89,7 @@ private:
     QString m_targetFile;
     QString m_targetName;
     QString m_workingDir;
+    QString m_buildDir;
     QString m_displayName;
     Utils::Environment m_environment;
     QPointer<ProjectExplorer::Project> m_project;

src/plugins/autotest/testoutputreader.cpp

@@ -57,14 +57,8 @@ static QString decode(const QString& original)
     return result;
 }
 
-static QString constructSourceFilePath(const QString &path, const QString &filePath,
+static QString constructSourceFilePath(const QString &path, const QString &filePath)
-                                       const QString &app)
 {
-    if (Utils::HostOsInfo::isMacHost() && !app.isEmpty()) {
-        const QString fileName(QFileInfo(app).fileName());
-        return QFileInfo(path.left(path.lastIndexOf(fileName + QLatin1String(".app"))), filePath)
-                   .canonicalFilePath();
-    }
     return QFileInfo(path, filePath).canonicalFilePath();
 }
 
@@ -137,16 +131,17 @@ static QString constructBenchmarkInformation(const QString &metric, double value
 }
 
 TestOutputReader::TestOutputReader(QFutureInterface<TestResult *> futureInterface,
-                                   QProcess *testApplication)
+                                   QProcess *testApplication, const QString &buildDirectory)
     : m_futureInterface(futureInterface)
     , m_testApplication(testApplication)
+    , m_buildDir(buildDirectory)
 {
     connect(m_testApplication, &QProcess::readyRead, this, &TestOutputReader::processOutput);
 }
 
 QtTestOutputReader::QtTestOutputReader(QFutureInterface<TestResult *> futureInterface,
-                                       QProcess *testApplication)
+                                       QProcess *testApplication, const QString &buildDirectory)
-    : TestOutputReader(futureInterface, testApplication)
+    : TestOutputReader(futureInterface, testApplication, buildDirectory)
 {
 }
 
@@ -207,9 +202,7 @@ void QtTestOutputReader::processOutput()
                                 attributes.value(QStringLiteral("type")).toString());
                     m_file = decode(attributes.value(QStringLiteral("file")).toString());
                     if (!m_file.isEmpty()) {
-                        const QString base = QFileInfo(m_testApplication->program()).absolutePath();
+                        m_file = constructSourceFilePath(m_buildDir, m_file);
-                        m_file = constructSourceFilePath(base, m_file,
-                                                       m_testApplication->program());
                     }
                     m_lineNumber = attributes.value(QStringLiteral("line")).toInt();
                 } else if (currentTag == QStringLiteral("BenchmarkResult")) {
@@ -306,8 +299,8 @@ void QtTestOutputReader::processOutput()
 }
 
 GTestOutputReader::GTestOutputReader(QFutureInterface<TestResult *> futureInterface,
-                                     QProcess *testApplication)
+                                     QProcess *testApplication, const QString &buildDirectory)
-    : TestOutputReader(futureInterface, testApplication)
+    : TestOutputReader(futureInterface, testApplication, buildDirectory)
 {
 }
 
@@ -403,11 +396,9 @@ void GTestOutputReader::processOutput()
             m_description.chop(1);
             testResult->setDescription(m_description);
 
-            const QString base = QFileInfo(m_testApplication->program()).absolutePath();
             foreach (const QString &output, m_description.split(QLatin1Char('\n'))) {
                 if (failureLocation.exactMatch(output)) {
-                    QString file = constructSourceFilePath(base, failureLocation.cap(1),
+                    QString file = constructSourceFilePath(m_buildDir, failureLocation.cap(1));
-                                                           m_testApplication->program());
                     if (file.isEmpty())
                         continue;
                     testResult->setFileName(file);

src/plugins/autotest/testoutputreader.h

@@ -45,19 +45,20 @@ class TestOutputReader : public QObject
     Q_OBJECT
 public:
     TestOutputReader(QFutureInterface<TestResult *> futureInterface,
-                     QProcess *testApplication);
+                     QProcess *testApplication, const QString &buildDirectory);
 
 protected:
     virtual void processOutput() = 0;
     QFutureInterface<TestResult *> m_futureInterface;
     QProcess *m_testApplication;  // not owned
+    QString m_buildDir;
 };
 
 class QtTestOutputReader : public TestOutputReader
 {
 public:
     QtTestOutputReader(QFutureInterface<TestResult *> futureInterface,
-                       QProcess *testApplication);
+                       QProcess *testApplication, const QString &buildDirectory);
 
 protected:
     void processOutput() override;
@@ -89,7 +90,7 @@ class GTestOutputReader : public TestOutputReader
 {
 public:
     GTestOutputReader(QFutureInterface<TestResult *> futureInterface,
-                      QProcess *testApplication);
+                      QProcess *testApplication, const QString &buildDirectory);
 
 protected:
     void processOutput() override;

src/plugins/autotest/testrunner.cpp

@@ -145,10 +145,12 @@ static void performTestRun(QFutureInterface<TestResult *> &futureInterface,
         QScopedPointer<TestOutputReader> outputReader;
         switch (testConfiguration->testType()) {
         case TestTypeQt:
-            outputReader.reset(new QtTestOutputReader(futureInterface, &testProcess));
+            outputReader.reset(new QtTestOutputReader(futureInterface, &testProcess,
+                                                      testConfiguration->buildDirectory()));
             break;
         case TestTypeGTest:
-            outputReader.reset(new GTestOutputReader(futureInterface, &testProcess));
+            outputReader.reset(new GTestOutputReader(futureInterface, &testProcess,
+                                                     testConfiguration->buildDirectory()));
             break;
         }
         if (futureInterface.isCanceled())