# HG changeset patch
# User timkelly
# Date 1242940006 18000
# Node ID fde39ed1f10924cc34b528b51621fa0652ea3cdb
# Parent 7e54d0e1a8736371655622ee879d7b7a6954b7d2
fix error parser bug 9091
diff -r 7e54d0e1a873 -r fde39ed1f109 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt Thu May 21 11:41:45 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt Thu May 21 16:06:46 2009 -0500
@@ -5,6 +5,9 @@
Making J:/epoc32/build/Cone/makefile.default
+Regression for bug 9091. Don't report info lines with SBSv2 error checker
+Could not write toolcheck cache: [Errno 2] No such file or directory: u'R:\\\\epoc32\\build\\toolcheck_cache__armv5_udeb.tmp'
+
Executing 'make -r -f "J:/epoc32/build/Cone/makefile.default" -j 4
DESCRAMBLE="C:/Symbian/SITK/sbs/bin/sbs_descramble.exe sbs2631027042"'
diff -r 7e54d0e1a873 -r fde39ed1f109 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/SBSv2ErrorParser.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/SBSv2ErrorParser.java Thu May 21 11:41:45 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/SBSv2ErrorParser.java Thu May 21 16:06:46 2009 -0500
@@ -26,6 +26,7 @@
private static final Pattern warningPattern = Pattern.compile("(.*)"); //$NON-NLS-1$
private static final Pattern errorPattern = Pattern.compile("(.*)"); //$NON-NLS-1$
+ private static final Pattern infoPattern = Pattern.compile("(.*)"); //$NON-NLS-1$
public SBSv2ErrorParser() {
}
@@ -34,7 +35,11 @@
initialise();
- Matcher matcher = warningPattern.matcher(line);
+ Matcher matcher = infoPattern.matcher(line);
+ if (matcher.matches()) {
+ return true; // just ignore info messages
+ }
+ matcher = warningPattern.matcher(line);
if (matcher.matches()) {
// strip the tags
String text = line.substring("".length(), line.length() - "".length()); //$NON-NLS-1$ //$NON-NLS-2$