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

Make failed test locations clickable in output

Browse Source
This commit is contained in:
Tobias Hunger
2010-08-29 16:42:03 +00:00
parent 9e012e7dff
commit 15da517b9b
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qtoutputformatter.cpp
View File

@@ -44,6 +44,7 @@ QtOutputFormatter::QtOutputFormatter(Qt4Project *project)
, m_qmlError(QLatin1String("(file:///.+:\\d+:\\d+):")) , m_qmlError(QLatin1String("(file:///.+:\\d+:\\d+):"))
, m_qtError(QLatin1String("Object::.*in (.*:\\d+)")) , m_qtError(QLatin1String("Object::.*in (.*:\\d+)"))
, m_qtAssert(QLatin1String("^ASSERT: .* in file (.+, line \\d+)$")) , m_qtAssert(QLatin1String("^ASSERT: .* in file (.+, line \\d+)$"))
, m_qtTestFail(QLatin1String("^ Loc: \\[(.*)\\]$"))
, m_project(project) , m_project(project)
{ {
} }
@@ -65,6 +66,10 @@ LinkResult QtOutputFormatter::matchLine(const QString &line) const
lr.href = m_qtAssert.cap(1); lr.href = m_qtAssert.cap(1);
lr.start = m_qtAssert.pos(1); lr.start = m_qtAssert.pos(1);
lr.end = lr.start + lr.href.length(); lr.end = lr.start + lr.href.length();
} else if (m_qtTestFail.indexIn(line) != -1) {
lr.href = m_qtTestFail.cap(1);
lr.start = m_qtTestFail.pos(1);
lr.end = lr.start + lr.href.length();
} }
return lr; return lr;
} }
@@ -178,6 +183,12 @@ void QtOutputFormatter::handleLink(const QString &href)
line = qtAssertLink.cap(2).toInt(); line = qtAssertLink.cap(2).toInt();
} }
QRegExp qtTestFailLink(QLatin1String("^(.*)\\((\\d+)\\)$"));
if (qtTestFailLink.indexIn(href) != -1) {
fileName = qtTestFailLink.cap(1);
line = qtTestFailLink.cap(2).toInt();
}
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
QFileInfo fi(fileName); QFileInfo fi(fileName);
if (fi.isRelative()) { if (fi.isRelative()) {

1
src/plugins/qt4projectmanager/qtoutputformatter.h
View File

@@ -62,6 +62,7 @@ private:
QRegExp m_qmlError; QRegExp m_qmlError;
QRegExp m_qtError; QRegExp m_qtError;
QRegExp m_qtAssert; QRegExp m_qtAssert;
QRegExp m_qtTestFail;
QWeakPointer<Qt4Project> m_project; QWeakPointer<Qt4Project> m_project;
QTextCharFormat m_linkFormat; QTextCharFormat m_linkFormat;
QString m_lastLine; QString m_lastLine;