diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2019-01-03 12:02:01 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2019-01-07 13:58:38 +0000 |
| commit | 5ad979e5ee0c2885e4b2c5f4094c3e7f212e0315 (patch) | |
| tree | 009d817035b4149da1488e1a44a6bcb65abfb254 | |
| parent | b1ced4a87d80b1c92ad1e9b05789ca38de0f9d25 (diff) | |
QtOutputFormatter: Handle Windows-style Qt Test failure links
Fixes: QTCREATORBUG-21744
Change-Id: Iaae1d58df641a0ba72d88c1fba5dbb47412a978c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/plugins/qtsupport/qtoutputformatter.cpp | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp index 8e05b8d159..58e1104c46 100644 --- a/src/plugins/qtsupport/qtoutputformatter.cpp +++ b/src/plugins/qtsupport/qtoutputformatter.cpp @@ -61,7 +61,8 @@ public: , qtError(QLatin1String("Object::.*in (.*:\\d+)")) , qtAssert(QLatin1String("ASSERT: .* in file (.+, line \\d+)")) , qtAssertX(QLatin1String("ASSERT failure in .*: \".*\", file (.+, line \\d+)")) - , qtTestFail(QLatin1String("^ Loc: \\[(.*)\\]")) + , qtTestFailUnix(QLatin1String("^ Loc: \\[(.*)\\]")) + , qtTestFailWin(QLatin1String("^(.*\\(\\d+\\)) : failure location\\s*$")) , project(proj) { } @@ -74,7 +75,8 @@ public: QRegExp qtError; QRegExp qtAssert; QRegExp qtAssertX; - QRegExp qtTestFail; + QRegExp qtTestFailUnix; + QRegExp qtTestFailWin; QPointer<Project> project; QString lastLine; FileInProjectFinder projectFinder; @@ -122,9 +124,13 @@ LinkResult QtOutputFormatter::matchLine(const QString &line) const lr.href = d->qtAssertX.cap(1); lr.start = d->qtAssertX.pos(1); lr.end = lr.start + lr.href.length(); - } else if (d->qtTestFail.indexIn(line) != -1) { - lr.href = d->qtTestFail.cap(1); - lr.start = d->qtTestFail.pos(1); + } else if (d->qtTestFailUnix.indexIn(line) != -1) { + lr.href = d->qtTestFailUnix.cap(1); + lr.start = d->qtTestFailUnix.pos(1); + lr.end = lr.start + lr.href.length(); + } else if (d->qtTestFailWin.indexIn(line) != -1) { + lr.href = d->qtTestFailWin.cap(1); + lr.start = d->qtTestFailWin.pos(1); lr.end = lr.start + lr.href.length(); } return lr; @@ -362,6 +368,21 @@ void QtSupportPlugin::testQtOutputFormatter_data() << QString::fromLatin1("file:///main.qml:20 Unexpected token `identifier'") << 0 << 19 << QString::fromLatin1("file:///main.qml:20") << QString::fromLatin1("/main.qml") << 20 << -1; + + QTest::newRow("Unix failed QTest link") + << QString::fromLatin1(" Loc: [../TestProject/test.cpp(123)]") + << 9 << 37 << QString::fromLatin1("../TestProject/test.cpp(123)") + << QString::fromLatin1("../TestProject/test.cpp") << 123 << -1; + + QTest::newRow("Windows failed QTest link") + << QString::fromLatin1("..\\TestProject\\test.cpp(123) : failure location") + << 0 << 28 << QString::fromLatin1("..\\TestProject\\test.cpp(123)") + << QString::fromLatin1("..\\TestProject\\test.cpp") << 123 << -1; + + QTest::newRow("Windows failed QTest link with carriage return") + << QString::fromLatin1("..\\TestProject\\test.cpp(123) : failure location\r") + << 0 << 28 << QString::fromLatin1("..\\TestProject\\test.cpp(123)") + << QString::fromLatin1("..\\TestProject\\test.cpp") << 123 << -1; } void QtSupportPlugin::testQtOutputFormatter() |