Fix the test execution in release variant on windows.

Previously, the hardcoded "debug" variant was used for execution tests on windows;
from now we calculate the path just before the execution.
This also drops some dead code.

Merge-request: 1
Reviewed-by: yoann

2 files changed, 29 insertions, 39 deletions

diff --git a/src/test.cpp b/src/test.cpp
index 5574d71..6f84372 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -60,15 +60,6 @@ Test::Test(const QString &name, const QString &path, const QString &pro)
     testPro(pro),
     testIsAvailable(true)
 {
-    testExecutable = path
-#ifdef Q_WS_WIN
-                     + QString("/debug")
-#endif
-                     + QString("/tst_") + name
-#ifdef Q_WS_WIN
-                     + QString(".exe")
-#endif
-                     ;
 }
 
 /**************************************************************************************************
@@ -81,6 +72,31 @@ Test::~Test()
 
 /**************************************************************************************************
  **************************************************************************************************/
+QString Test::executable() const
+{
+    QString exe = testPath;
+#ifdef Q_WS_WIN
+    //prepend debug or release if needed
+    if (!MainWindow::getCurrentProfile()->variant().isEmpty())
+        exe += QLatin1Char('/') + MainWindow::getCurrentProfile()->variant();
+#endif
+    exe += QLatin1String("/tst_") + testName;
+
+    //append OS specific suffix
+#ifdef Q_WS_MAC
+    QFileInfo f(MainWindow::getCurrentQtVersion()->testBuildDir() + exe);
+    if (!f.exists())
+        exe += QLatin1String(".app");
+#endif
+#ifdef Q_WS_WIN
+    exe += QLatin1String(".exe");
+#endif
+
+    return exe;
+}
+
+/**************************************************************************************************
+ **************************************************************************************************/
 void Test::run()
 {
     Logger::getIt()->log(QString("<b>Running auto-test %1</b>").arg(testName));
@@ -144,12 +160,6 @@ int Test::buildTest()
         setStatus(BuildError);
     }
 
-#ifdef Q_WS_MAC
-    QFileInfo f(MainWindow::getCurrentQtVersion()->testBuildDir() + testExecutable);
-    if (!f.exists())
-        testExecutable += QString(".app");
-#endif
-
     return ret;
 }
 
@@ -162,26 +172,8 @@ int Test::runTest()
     int code = 0;
     if (!MainWindow::getCurrentQtVersion()->isCrossCompiled()) {
         //A desktop platform, run the test directly and capture it's stdout
-        QString exe;
-#ifdef Q_WS_WIN
-        //prepend debug or release if needed
-        if (!MainWindow::getCurrentProfile()->variant().isEmpty())
-            exe = MainWindow::getCurrentProfile()->variant() + QLatin1Char('/') + testExecutable;
-        else
-#endif
-            exe = testExecutable;
-        //append OS specific suffix
-#ifdef Q_WS_MAC
-        QFileInfo f(testExecutable);
-        if (!f.exists())
-            exe += QString(".app");
-#endif
-#ifdef Q_WS_WIN
-        exe += QLatin1String(".exe");
-#endif
-
         code = runExecutable(MainWindow::getCurrentQtVersion()->testBuildDir() + testPath,
-                             MainWindow::getCurrentQtVersion()->testBuildDir() + testExecutable,
+                             MainWindow::getCurrentQtVersion()->testBuildDir() + executable(),
                              MainWindow::getCurrentQtVersion()->libDir(),
                              QStringList() << "-xml" << "-flush" << m_globalArguments.split(" ", QString::SkipEmptyParts), true);
     }
@@ -290,10 +282,10 @@ int Test::runExecutable(const QString &workdir, const QString &executable, const
     proEnv.insert("QTDIR", MainWindow::getCurrentQtVersion()->buildDir());
     p->setProcessEnvironment(proEnv);
 
-    if (workdir != QString())
+    if (!workdir.isEmpty())
         p->setWorkingDirectory(workdir);
 
-    if (arguments == QStringList())
+    if (arguments.isEmpty())
         p->start(executable);
     else
         p->start(executable, arguments);
diff --git a/src/test.h b/src/test.h
index ffcc170..2bd1ed9 100644
--- a/src/test.h
+++ b/src/test.h
@@ -91,8 +91,7 @@ public:
     { return testName; }
     inline QString path() const
     { return testPath; }
-    inline QString executable() const
-    { return testExecutable; }
+    QString executable() const;
     inline Test::TestStatus status() const
     { return teststatus; }
     inline void reset()
@@ -139,7 +138,6 @@ protected Q_SLOTS:
 private:
     QString testName;
     QString testPath;
-    QString testExecutable;
     TestStatus teststatus;
     TestResult r;
     QProcess *p;