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

QtSupport: De-duplicate test failure pattern

Browse Source 
The pattern needed to be changed to create a single capuring
group that is used in QtOutputFormatter::matchLine() and in
QtTestOutputReader::processPlainTextOutput().

Also, trailing characters (except whitespaces like carriage
return on Windows) are now forbidden.

Change-Id: I5c6260276e0c2954b917daa12c6882c99f135fa0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Andre Hartmann
2019-03-15 07:03:28 +01:00
committed by André Hartmann
parent fb4d8b5a01
commit 9a0ef8ac64
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qtsupport/qtoutputformatter.h
View File

@@ -33,8 +33,8 @@
#define QT_QML_URL_REGEXP "(?:file|qrc):(?://)?/.+?"
#define QT_ASSERT_REGEXP "ASSERT: .* in file (.+, line \\d+)"
#define QT_ASSERT_X_REGEXP "ASSERT failure in .*: \".*\", file (.+, line \\d+)"
#define QT_TEST_FAIL_UNIX_REGEXP "^ Loc: \\[(.*)\\]$"
#define QT_TEST_FAIL_WIN_REGEXP "^(.*\\(\\d+\\)) : failure location\\s*$"
#define QT_TEST_FAIL_UNIX_REGEXP "^ Loc: \\[((?<file>.+)\\((?<line>\\d+)\\))\\]$"
#define QT_TEST_FAIL_WIN_REGEXP "^((?<file>.+)\\((?<line>\\d+)\\)) : failure location\\s*$"
namespace ProjectExplorer { class Project; }

6
src/plugins/qtsupport/qttestparser.cpp
View File

@@ -25,6 +25,8 @@
#include "qttestparser.h"
#include "qtoutputformatter.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
@@ -61,8 +63,8 @@ void QtTestParser::stdOutput(const QString &line)
return;
}
static const QRegularExpression locationPattern(HostOsInfo::isWindowsHost()
? QString("^(?<file>.+)\\((?<line>\\d+)\\) : failure location.*$")
: QString("^ Loc: \\[(?<file>.+)\\((?<line>\\d+)\\)\\].*$"));
? QString(QT_TEST_FAIL_WIN_REGEXP)
: QString(QT_TEST_FAIL_UNIX_REGEXP));
QTC_CHECK(locationPattern.isValid());
const QRegularExpressionMatch match = locationPattern.match(theLine);
if (match.hasMatch()) {