feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Show results for debugging tests as well

Browse Source 
At least display results for using gdb or lldb and inform
user that we are not able to do so when using cdb.

Task-number: QTCREATORBUG-16693
Change-Id: I1a98a79aaf76de47b5dcb58d4dca9247f1642d36
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Stenger
2016-07-21 16:02:42 +02:00
parent e0e314427d
commit 053f5bf3d3
7 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/plugins/autotest/testrunner.cpp
View File

@@ -47,6 +47,7 @@
#include <QFutureInterface>
#include <QTime>
#include <debugger/debuggerkitinformation.h>
#include <debugger/debuggerruncontrol.h>
#include <debugger/debuggerstartparameters.h>
@@ -250,6 +251,33 @@ void TestRunner::runTests()
Core::ProgressManager::addTask(future, tr("Running Tests"), Autotest::Constants::TASK_INDEX);
}
static void processOutput(TestOutputReader *outputreader, const QString &msg,
Debugger::OutputProcessor::OutputChannel channel)
{
switch (channel) {
case Debugger::OutputProcessor::StandardOut: {
static const QString gdbSpecialOut = "Qt: gdb: -nograb added to command-line options.\n"
"\t Use the -dograb option to enforce grabbing.";
int start = msg.startsWith(gdbSpecialOut) ? gdbSpecialOut.length() + 1 : 0;
if (start) {
int maxIndex = msg.length() - 1;
while (start < maxIndex && msg.at(start + 1) == '\n')
++start;
if (start >= msg.length()) // we cut out the whole message
break;
}
for (const QString &line : msg.mid(start).split('\n'))
outputreader->processOutput(line.toUtf8() + '\n');
break;
}
case Debugger::OutputProcessor::StandardError:
outputreader->processStdError(msg.toUtf8());
break;
default:
QTC_CHECK(false); // unexpected channel
}
}
void TestRunner::debugTests()
{
// TODO improve to support more than one test configuration
@@ -293,6 +321,35 @@ void TestRunner::debugTests()
return;
}
bool useOutputProcessor = true;
if (ProjectExplorer::Target *targ = config->project()->activeTarget()) {
if (Debugger::DebuggerKitInformation::engineType(targ->kit()) == Debugger::CdbEngineType) {
emit testResultReady(TestResultPtr(new FaultyTestResult(Result::MessageWarn,
TestRunner::tr("Unable to display test results when using CDB."))));
useOutputProcessor = false;
}
}
// We need a fake QFuture for the results. TODO: replace with QtConcurrent::run
QFutureInterface<TestResultPtr> *futureInterface
= new QFutureInterface<TestResultPtr>(QFutureInterfaceBase::Running);
QFuture<TestResultPtr> future(futureInterface);
m_futureWatcher.setFuture(future);
if (useOutputProcessor) {
TestOutputReader *outputreader = config->outputReader(*futureInterface, 0);
Debugger::OutputProcessor *processor = new Debugger::OutputProcessor;
processor->logToAppOutputPane = false;
processor->process = [outputreader] (const QString &msg,
Debugger::OutputProcessor::OutputChannel channel) {
processOutput(outputreader, msg, channel);
};
runControl->setOutputProcessor(processor);
connect(runControl, &Debugger::DebuggerRunControl::finished,
outputreader, &QObject::deleteLater);
}
connect(this, &TestRunner::requestStopTestRun, runControl, &Debugger::DebuggerRunControl::stop);
connect(runControl, &Debugger::DebuggerRunControl::finished, this, &TestRunner::onFinished);
ProjectExplorer::ProjectExplorerPlugin::startRunControl(