From 11505c366e3b3e2530f52225897bdbece4656ee7 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 6 Sep 2010 16:34:07 +0200
Subject: [PATCH] Recognize <command line> as a file name in GCC warnings
* ... add a unit test.
---
src/plugins/projectexplorer/gccparser.cpp | 24 ++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index ddcf7b9d79d..953a39a822d 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -36,7 +36,7 @@ using namespace ProjectExplorer;
namespace {
// opt. drive letter + filename: (2 brackets)
- const char * const FILE_PATTERN = "(([A-Za-z]:)?[^:]+\\.[^:]+):";
+ const char * const FILE_PATTERN = "(<command line>|([A-Za-z]:)?[^:]+\\.[^:]+):";
const char * const COMMAND_PATTERN = "^(.*[\\\\/])?([a-z0-9]+-[a-z0-9]+-[a-z0-9]+-)?(gcc|g\\+\\+)(-[0-9\\.]+)?(\\.exe)?: ";
}
@@ -584,6 +584,28 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
QLatin1String("../../../src/XmlUg/targetdelete.c"), -1,
Constants::TASK_CATEGORY_COMPILE))
<< QString();
+
+ QTest::newRow("GCCE 4: commandline, includes")
+ << QString::fromLatin1("In file included from /Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h:15,\n"
+ " from <command line>:26:\n"
+ "/Symbian/SDK/epoc32/include/variant/Symbian_OS.hrh:1134:26: warning: no newline at end of file")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << ( QList<ProjectExplorer::Task>()
+ << Task(Task::Unknown,
+ QLatin1String("In file included from /Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h:15,"),
+ QLatin1String("/Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h"), 15,
+ Constants::TASK_CATEGORY_COMPILE)
+ << Task(Task::Unknown,
+ QLatin1String("from <command line>:26:"),
+ QLatin1String("<command line>"), 26,
+ Constants::TASK_CATEGORY_COMPILE)
+ << Task(Task::Warning,
+ QLatin1String("no newline at end of file"),
+ QLatin1String("/Symbian/SDK/epoc32/include/variant/Symbian_OS.hrh"), 1134,
+ Constants::TASK_CATEGORY_COMPILE))
+ << QString();
+
}
void ProjectExplorerPlugin::testGccOutputParsers()
--
GitLab