From 4edfcba20ad43fec20d93ebb37e245aba03f1160 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Mon, 29 Mar 2010 16:28:27 +0000
Subject: [PATCH] bug 307365: Problems with make error parser, incorrectly
 matches gcc messages

---
 .../internal/errorparsers/tests/MakeErrorParserTests.java    | 5 +++--
 core/org.eclipse.cdt.core/plugin.xml                         | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java
index 95fc223f66f..b49d58a31c7 100644
--- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java
+++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java
@@ -57,8 +57,9 @@ public class MakeErrorParserTests extends GenericErrorParserTests {
 		"Makefile4:10: *** commands commence before first target. Stop.",
 		"Makefile5:10: *** Recursive variable 'VAR' references itself (eventually). Stop.",
 		"Makefile6:10: *** target pattern contains no `%'.  Stop.",
-		// Ignored
-		"mytest.cpp:19: warning: unused variable 'i'", // do not intercept compiler warnings
+		// Ignored. Do not intercept compiler warnings
+		"mytest.cpp:19: warning: unused variable 'i'",
+		"hello.c:14:17: error: foo.h: No such file or directory",
 	};
 	private static final int GMAKE_ERROR_STREAM1_WARNINGS = 2;
 	private static final int GMAKE_ERROR_STREAM1_ERRORS = 5;
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index da487f7dd7d..cb746c71505 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -270,7 +270,7 @@
          <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex=".*make.*: Target (.*) not remade because of errors." severity="Error"/>
          <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*[Mm]akefile):(\d*): warning: (.*)" severity="Warning"/>
          <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex=".*make.*\[.*\] Error [-]{0,1}\d*.*" severity="Warning"/>
-         <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*):(\d*): (.*No such file or directory)" severity="Warning"/>
+         <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*):(\d*): (\S*: No such file or directory)" severity="Warning"/>
          <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex=".*make.*: Circular .* dependency dropped." severity="Warning"/>
       </errorparser>
    </extension>