Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gvozdev2012-03-22 17:53:03 -0400
committerAndrew Gvozdev2012-03-22 17:53:03 -0400
commit362cd87be01de89221ad5a3db9e47a23617a7a57 (patch)
treebfe9f62bd39fd48010886cecd4ce16c8a4c31753 /xlc/org.eclipse.cdt.make.xlc.core
parent32e726817d6f5ccf3bd99a6ea16fcfd81c97acf6 (diff)
downloadorg.eclipse.cdt-362cd87be01de89221ad5a3db9e47a23617a7a57.tar.gz
org.eclipse.cdt-362cd87be01de89221ad5a3db9e47a23617a7a57.tar.xz
org.eclipse.cdt-362cd87be01de89221ad5a3db9e47a23617a7a57.zip
bug 71511: Fixed scanner discovery for minGW
Trim line by scanner discovery console parsers
Diffstat (limited to 'xlc/org.eclipse.cdt.make.xlc.core')
-rw-r--r--xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java5
-rw-r--r--xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java
index 115a69ded7..64ed3c4c08 100644
--- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java
+++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java
@@ -110,6 +110,11 @@ public abstract class AbstractXLCBuildOutputParser implements IScannerInfoConsol
*/
@Override
public boolean processLine(String line) {
+ line= line.trim();
+ if (line.length() == 0) {
+ return false;
+ }
+
boolean rc = false;
int lineBreakPos = line.length() - 1;
char[] lineChars = line.toCharArray();
diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java
index 04cd1c42b9..6df289d3a1 100644
--- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java
+++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java
@@ -97,6 +97,11 @@ public class XlCSpecsConsoleParser implements IScannerInfoConsoleParser {
TraceUtil.outputTrace(
"XLCSpecsConsoleParser parsing line: [", line, "]"); //$NON-NLS-1$ //$NON-NLS-2$
+ line= line.trim();
+ if (line.length() == 0) {
+ return false;
+ }
+
// testing the output line against the pattern of interest
Matcher lineMatcher = linePattern.matcher(line);
if (lineMatcher.matches()) {

Back to the top