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

ProjectExplorer: Fix some output parser tests on Windows

Browse Source 
The failures were likely introduced by semi-recent refactorings in the
area.

Change-Id: I49e74c703e3a8c297cecc1dc7d38bbae03b1bc72
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2024-10-11 14:43:08 +02:00
parent 00405833cc
commit af44a93f35
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/gccparser.cpp
View File

@@ -183,13 +183,15 @@ OutputLineParser::Result GccParser::handleLine(const QString &line, OutputFormat
const QString lne = rightTrimmed(line); const QString lne = rightTrimmed(line);
// Blacklist some lines to not handle them: // Blacklist some lines to not handle them:
static const QString collect2Prefix = HostOsInfo::withExecutableSuffix("collect2") + ':';
if (lne.startsWith(QLatin1String("TeamBuilder ")) if (lne.startsWith(QLatin1String("TeamBuilder "))
|| lne.startsWith(QLatin1String("distcc[")) || lne.startsWith(QLatin1String("distcc["))
|| lne.contains("undefined reference") || lne.contains("undefined reference")
|| lne.contains("undefined symbol") || lne.contains("undefined symbol")
|| lne.contains("duplicate symbol") || lne.contains("duplicate symbol")
|| lne.contains("multiple definition") || lne.contains("multiple definition")
|| lne.contains("ar: creating")) { || lne.contains("ar: creating")
|| lne.contains(collect2Prefix)) {
return Status::NotHandled; return Status::NotHandled;
} }
@@ -442,7 +444,7 @@ void ProjectExplorerTest::testGccOutputParsers_data()
formatRanges.clear(); formatRanges.clear();
if (HostOsInfo::isWindowsHost()) { if (HostOsInfo::isWindowsHost()) {
formatRanges << formatRange(51, 28) formatRanges << formatRange(51, 28)
<< formatRange(79, 31, "olpfile://C:/temp/test/untitled8/main.cpp::0::-1") << formatRange(79, 31, "olpfile://C:/temp/test/untitled8/main.cpp::-1::-1")
<< formatRange(110, 65); << formatRange(110, 65);
} else { } else {
formatRanges << formatRange(51, 124); formatRanges << formatRange(51, 124);
@@ -755,13 +757,13 @@ void ProjectExplorerTest::testGccOutputParsers_data()
formatRanges.clear(); formatRanges.clear();
if (HostOsInfo::isWindowsHost()) { if (HostOsInfo::isWindowsHost()) {
formatRanges << formatRange(33, 22) formatRanges << formatRange(33, 22)
<< formatRange(55, 38, "olpfile://C:/Symbian_SDK/epoc32/include/e32cmn.h::6792::-1") << formatRange(55, 38, "olpfile://C:/Symbian_SDK/epoc32/include/e32cmn.h::6792::0")
<< formatRange(93, 29) << formatRange(93, 29)
<< formatRange(122, 38, "olpfile://C:/Symbian_SDK/epoc32/include/e32std.h::25::-1") << formatRange(122, 38, "olpfile://C:/Symbian_SDK/epoc32/include/e32std.h::25::0")
<< formatRange(160, 5) << formatRange(160, 5)
<< formatRange(165, 40, "olpfile://C:/Symbian_SDK/epoc32/include/e32cmn.inl::0::-1") << formatRange(165, 40, "olpfile://C:/Symbian_SDK/epoc32/include/e32cmn.inl::0::0")
<< formatRange(205, 69) << formatRange(205, 69)
<< formatRange(274, 40, "olpfile://C:/Symbian_SDK/epoc32/include/e32cmn.inl::7094::-1") << formatRange(274, 40, "olpfile://C:/Symbian_SDK/epoc32/include/e32cmn.inl::7094::0")
<< formatRange(314, 48); << formatRange(314, 48);
} else { } else {
formatRanges << formatRange(33, 329); formatRanges << formatRange(33, 329);