Commit a2a4fe56 authored by Christian Stenger's avatar Christian Stenger Committed by Christian Stenger
Browse files

Cancel process when timeout is reached...

...and display fatal messages on the summary as well.
parent 1145febc
......@@ -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);
}
......
......@@ -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;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment