From 07cac1aa54f8ab77a7a94203ae51f9f1b5249e36 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 11 May 2012 02:48:59 -0400 Subject: [PATCH] bug 378981: Include pattern for LLVM/clang in build output parser default compiler command pattern --- .../providers/tests/GCCBuildCommandParserTest.java | 12 ++++++++++++ build/org.eclipse.cdt.managedbuilder.core/plugin.xml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java index 022f671cd5c..b719fbf4312 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java @@ -446,6 +446,8 @@ public class GCCBuildCommandParserTest extends BaseTestCase { IFile file6=ResourceHelper.createFile(project, "file6.cpp"); IFile file7=ResourceHelper.createFile(project, "file7.cpp"); IFile file8=ResourceHelper.createFile(project, "file8.cpp"); + IFile file9=ResourceHelper.createFile(project, "file9.cpp"); + IFile file10=ResourceHelper.createFile(project, "file10.cpp"); ICLanguageSetting ls = cfgDescription.getLanguageSettingForFile(file1.getProjectRelativePath(), true); String languageId = ls.getLanguageId(); @@ -462,6 +464,8 @@ public class GCCBuildCommandParserTest extends BaseTestCase { parser.processLine("/absolute/path/gcc -I/path0 file6.cpp"); parser.processLine(" \"/absolute/path/gcc\" -I/path0 file7.cpp"); parser.processLine("../relative/path/gcc -I/path0 file8.cpp"); + parser.processLine("clang -I/path0 file9.cpp"); + parser.processLine("clang++ -I/path0 file10.cpp"); parser.shutdown(); // check populated entries @@ -498,6 +502,14 @@ public class GCCBuildCommandParserTest extends BaseTestCase { List entries = parser.getSettingEntries(cfgDescription, file8, languageId); assertEquals(new CIncludePathEntry(path0, 0), entries.get(0)); } + { + List entries = parser.getSettingEntries(cfgDescription, file9, languageId); + assertEquals(new CIncludePathEntry(path0, 0), entries.get(0)); + } + { + List entries = parser.getSettingEntries(cfgDescription, file10, languageId); + assertEquals(new CIncludePathEntry(path0, 0), entries.get(0)); + } } /** diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml index 14cde1542a5..360a7c32149 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml @@ -617,7 +617,7 @@ class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" name="CDT GCC Build Output Parser" - parameter="(gcc)|([gc]\+\+)" + parameter="(gcc)|([gc]\+\+)|(clang)" prefer-non-shared="true">