Cancel process when timeout is reached...

...and display fatal messages on the summary as well.

2 files changed, 12 insertions, 0 deletions

diff --git a/plugins/autotest/testresultspane.cpp b/plugins/autotest/testresultspane.cpp
index e903aecffd..d14b7567ca 100644
--- a/plugins/autotest/testresultspane.cpp
+++ b/plugins/autotest/testresultspane.cpp
@@ -309,6 +309,10 @@ void TestResultsPane::updateSummaryLabel()
     if (count)
         labelText.append(QString::fromLatin1(", %1 %2")
                          .arg(QString::number(count), tr("expected fails")));
+    count = m_model->resultTypeCount(ResultType::MESSAGE_FATAL);
+    if (count)
+        labelText.append(QString::fromLatin1(", %1 %2")
+                         .arg(QString::number(count), tr("fatals")));
     labelText.append(QLatin1String(".</p>"));
     m_summaryLabel->setText(labelText);
 }
diff --git a/plugins/autotest/testrunner.cpp b/plugins/autotest/testrunner.cpp
index 4591f94081..fb4028edf0 100644
--- a/plugins/autotest/testrunner.cpp
+++ b/plugins/autotest/testrunner.cpp
@@ -288,6 +288,14 @@ bool performExec(const QString &cmd, const QStringList &args, const QString &wor
     if (ok && executionTimer.elapsed() < timeout) {
         return m_runner->exitCode() == 0;
     } else {
+        if (m_runner->state() != QProcess::NotRunning) {
+            m_runner->kill();
+            m_runner->waitForFinished();
+            TestResultsPane::instance()->addTestResult(
+                        TestResult(QString(), QString(), QString(), ResultType::MESSAGE_FATAL,
+                                   QObject::tr("*** Test Case canceled due to timeout ***\n"
+                                               "Maybe raise the timeout?")));
+        }
         return false;
     }
 }