From 8f39e05e40fa1d7fe3ca45942f39c9848f10015b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 22 May 2015 15:13:18 +0200 Subject: Adapt MSVC output parser to MSVC 2015. The space character after the line number was removed from the compiler messages. Change-Id: Ia249a6d4416744c67aada2eb2c5c26cf87bd7ef7 Reviewed-by: Joerg Bornemann --- src/plugins/projectexplorer/outputparser_test.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/plugins/projectexplorer/outputparser_test.cpp') diff --git a/src/plugins/projectexplorer/outputparser_test.cpp b/src/plugins/projectexplorer/outputparser_test.cpp index bd5112f71a..f29e95f4e4 100644 --- a/src/plugins/projectexplorer/outputparser_test.cpp +++ b/src/plugins/projectexplorer/outputparser_test.cpp @@ -37,6 +37,13 @@ namespace ProjectExplorer { +static inline QByteArray msgFileComparisonFail(const Utils::FileName &f1, const Utils::FileName &f2) +{ + const QString result = QLatin1Char('"') + f1.toUserOutput() + + QLatin1String("\" != \"") + f2.toUserOutput() + QLatin1Char('"'); + return result.toLocal8Bit(); +} + OutputParserTester::OutputParserTester() : m_debug(false) { } @@ -83,7 +90,8 @@ void OutputParserTester::testParsing(const QString &lines, for (int i = 0; i < tasks.size(); ++i) { QCOMPARE(m_receivedTasks.at(i).category, tasks.at(i).category); QCOMPARE(m_receivedTasks.at(i).description, tasks.at(i).description); - QCOMPARE(m_receivedTasks.at(i).file, tasks.at(i).file); + QVERIFY2(m_receivedTasks.at(i).file == tasks.at(i).file, + msgFileComparisonFail(m_receivedTasks.at(i).file, tasks.at(i).file)); QCOMPARE(m_receivedTasks.at(i).line, tasks.at(i).line); QCOMPARE(static_cast(m_receivedTasks.at(i).type), static_cast(tasks.at(i).type)); } @@ -103,7 +111,8 @@ void OutputParserTester::testTaskMangling(const Task &input, if (m_receivedTasks.size() == 1) { QCOMPARE(m_receivedTasks.at(0).category, output.category); QCOMPARE(m_receivedTasks.at(0).description, output.description); - QCOMPARE(m_receivedTasks.at(0).file, output.file); + QVERIFY2(m_receivedTasks.at(0).file == output.file, + msgFileComparisonFail(m_receivedTasks.at(0).file, output.file)); QCOMPARE(m_receivedTasks.at(0).line, output.line); QCOMPARE(m_receivedTasks.at(0).type, output.type); } -- cgit v1.2.3