# HG changeset patch
# User timkelly
# Date 1250262575 18000
# Node ID f1c7a3b765bcaeea1990b2bcf5da0096cda06989
# Parent  5803accfc5d01e99f32dbd778d4a2665da03c93e
fix makmake error parser tests, add remainder of error parser tests missing from the builder full test suite.

diff -r 5803accfc5d0 -r f1c7a3b765bc builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/makmake.errors.regression.1.xml
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/makmake.errors.regression.1.xml	Fri Aug 14 08:52:53 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/makmake.errors.regression.1.xml	Fri Aug 14 10:09:35 2009 -0500
@@ -14,7 +14,5 @@
   <marker_info file="^EMPTY^" line_number="-1" message="ERROR: No Sources specified" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
   <!--Error Marker at index 6-->
   <marker_info file="^EMPTY^" line_number="-1" message="ERROR: No Sources specified" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
-  <!--Error Marker at index 7-->
-  <marker_info file="^EMPTY^" line_number="23" message="#error test" severity="2" variable_name="^EMPTY^" external_path_string="C:/runtime-EclipseApplication/GUIFooey/group/BLD.INF" />
 </root>
 
diff -r 5803accfc5d0 -r f1c7a3b765bc builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/regression.capture.xml
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/regression.capture.xml	Fri Aug 14 08:52:53 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/regression.capture.xml	Fri Aug 14 10:09:35 2009 -0500
@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
- <!--Error Marker at index 0-->
-  <marker_info file="^EMPTY^" line_number="0" message="No such file or directory" severity="2" variable_name="^EMPTY^" external_path_string="test/test.cpp:" />
+  <!--Error Marker at index 0-->
+  <marker_info file="^EMPTY^" line_number="2" message="Unrecognised Keyword &quot;TARGE&quot;[\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP]" severity="1" variable_name="^EMPTY^" external_path_string="/APPS/Nokia/DDB21Nightly/workspace/ListBox/group/LISTBOX.MMP" />
   <!--Error Marker at index 1-->
-  <marker_info file="^EMPTY^" line_number="0" message="no input files" severity="2" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
+  <marker_info file="^EMPTY^" line_number="-1" message="ERROR: No Target specified" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
   <!--Error Marker at index 2-->
-  <marker_info file="^EMPTY^" line_number="0" message="`-x c++' after last input file has no effect" severity="1" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
+  <marker_info file="^EMPTY^" line_number="11" message="SOURCEPATH &quot;\APPS\Nokia\DDB21Nightly\workspace\ListBox\datx\&quot; not found[\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP]" severity="1" variable_name="^EMPTY^" external_path_string="/APPS/Nokia/DDB21Nightly/workspace/ListBox/group/LISTBOX.MMP" />
   <!--Error Marker at index 3-->
-  <marker_info file="^EMPTY^" line_number="0" message="some message" severity="2" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
+  <marker_info file="^EMPTY^" line_number="6" message="Stack size doesn't fit expected number format[\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP]" severity="3" variable_name="^EMPTY^" external_path_string="/APPS/Nokia/DDB21Nightly/workspace/ListBox/group/LISTBOX.MMP" />
   <!--Error Marker at index 4-->
-  <marker_info file="^EMPTY^" line_number="11" message="value with length 0 violates the length restriction: length (1 .. infinity)" severity="2" variable_name="^EMPTY^" external_path_string="foo.cc" />
+  <marker_info file="^EMPTY^" line_number="42" message="BITMAP color depth &quot;listboxlistbox.cpp&quot; - unexpected format[\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP]" severity="3" variable_name="^EMPTY^" external_path_string="/APPS/Nokia/DDB21Nightly/workspace/ListBox/group/LISTBOX.MMP" />
   <!--Error Marker at index 5-->
-  <marker_info file="^EMPTY^" line_number="11" message="value with length 0 violates the length restriction" severity="2" variable_name="^EMPTY^" external_path_string="foo.cc" />
+  <marker_info file="^EMPTY^" line_number="-1" message="ERROR: No Sources specified" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
   <!--Error Marker at index 6-->
-  <marker_info file="^EMPTY^" line_number="242" message="enumeral mismatch in conditional expression: `TFalse' vs `TTrue'" severity="1" variable_name="^EMPTY^" external_path_string="/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/eikmenup.h" />
-  <!--Error Marker at index 7-->
-  <marker_info file="^EMPTY^" line_number="39" message="invalid function declaration" severity="2" variable_name="^EMPTY^" external_path_string="/runtime-EclipseApplication/GUIFooey/src/guifooeyappui.cpp" />
-  <!--Error Marker at index 8-->
-  <marker_info file="^EMPTY^" line_number="39" message="expected unqualified-id before ':' token" severity="2" variable_name="^EMPTY^" external_path_string="/runtime-EclipseApplication/GUIFooey/src/guifooeyappui.cpp" />
-  <!--Error Marker at index 9-->
-  <marker_info file="^EMPTY^" line_number="34" message="candidate is: virtual void CGUIFooeyAppUi::ConstructL()" severity="2" variable_name="^EMPTY^" external_path_string="/runtime-EclipseApplication/GUIFooey/inc/GUIFooeyAppUi.h" />
-  <!--Error Marker at index 10-->
-  <marker_info file="^EMPTY^" line_number="49" message="unused variable 'j'" severity="1" variable_name="^EMPTY^" external_path_string="/runtime-EclipseApplication/GUIFooey/inc/GUIFooeyAppUi.h" />
+  <marker_info file="^EMPTY^" line_number="-1" message="ERROR: No Sources specified" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
 </root>
 
diff -r 5803accfc5d0 -r f1c7a3b765bc builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/your.input.errorparser.txt
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/your.input.errorparser.txt	Fri Aug 14 08:52:53 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/your.input.errorparser.txt	Fri Aug 14 10:09:35 2009 -0500
@@ -1,11 +1,32 @@
-arm-none-symbianelf-g++: \test\test.cpp: No such file or directory
-arm-none-symbianelf-g++: no input files
-arm-none-symbianelf-g++: warning: `-x c++' after last input file has no effect
-arm-none-symbianelf-g++: error: some message
-foo.cc:11:20: error: value with length 0 violates the length restriction: length (1 .. infinity)
-foo.cc:11:20: error: value with length 0 violates the length restriction
-/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/eikmenup.h:242: warning: enumeral mismatch in conditional expression: `TFalse' vs `TTrue'
-/runtime-EclipseApplication/GUIFooey/src/guifooeyappui.cpp:39: error: invalid function declaration
-/runtime-EclipseApplication/GUIFooey/src/guifooeyappui.cpp:39: error: expected unqualified-id before ':' token
-/runtime-EclipseApplication/GUIFooey/inc/GUIFooeyAppUi.h:34: error: candidate is: virtual void CGUIFooeyAppUi::ConstructL()
-/runtime-EclipseApplication/GUIFooey/inc/GUIFooeyAppUi.h:49: warning: unused variable 'j'
\ No newline at end of file
+MMPFILE "\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP"
+Died at C:\Symbian\9.3\S60_3rd_FP2_Beta\epoc32\tools\/MMP.PM line 1814.
+make: *** [MAKEFILELISTBOX] Error 255
+perl -S makmake.pl -nd -D \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX ARMV5  
+WARNING: \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP(2) : Unrecognised Keyword "TARGE"
+
+FATAL ERROR: ERROR: No Target specified
+
+MMPFILE "\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP"
+perl -S makmake.pl -nd -D \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX ARMV5  
+WARNING: \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP(11) : SOURCEPATH "\APPS\Nokia\DDB21Nightly\workspace\ListBox\datx\" not found
+
+MMPFILE "\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP"
+Died at C:\Symbian\9.3\S60_3rd_FP2_Beta\epoc32\tools\/MMP.PM line 1814.
+make: *** [MAKEFILELISTBOX] Error 255
+perl -S makmake.pl -nd -D \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX ARMV5  
+FATAL ERROR: \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP(6) : Stack size doesn't fit expected number format
+
+MMPFILE "\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP"
+Died at C:\Symbian\9.3\S60_3rd_FP2_Beta\epoc32\tools\/MMP.PM line 1814.
+make: *** [MAKEFILELISTBOX] Error 255
+perl -S makmake.pl -nd -D \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX ARMV5  
+FATAL ERROR: \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP(42) : BITMAP color depth "listboxlistbox.cpp" - unexpected format
+
+FATAL ERROR: ERROR: No Sources specified
+
+FATAL ERROR: ERROR: No Sources specified
+
+C:\runtime-EclipseApplication\GUIFooey\group\BLD.INF:23: #error test
+BLDMAKE ERROR: ERROR: cpp.exe returned non-zero exit status (8448)
+	cpp.EXE -undef -nostdinc -+  -I "C:\S60\devices\S60_5th_Edition_SDK_v1.0\epoc32\include" -I . -I "C:\runtime-EclipseApplication\GUIFooey\group\"  -I "C:\S60\devices\S60_5th_Edition_SDK_v1.0\EPOC32\include\variant" -include "C:\S60\devices\S60_5th_Edition_SDK_v1.0\EPOC32\include\variant\Symbian_OS.hrh" "C:\runtime-EclipseApplication\GUIFooey\group\BLD.INF"
+
diff -r 5803accfc5d0 -r f1c7a3b765bc builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/AllTests.java
--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/AllTests.java	Fri Aug 14 08:52:53 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/AllTests.java	Fri Aug 14 10:09:35 2009 -0500
@@ -41,6 +41,9 @@
 		// error parser tests....
 		suite.addTestSuite(com.nokia.carbide.cdt.builder.test.errorParsers.TestMakmakeErrorParser.class);
 		suite.addTestSuite(com.nokia.carbide.cdt.builder.test.errorParsers.TestRVCTErrorParser.class);
+		suite.addTestSuite(com.nokia.carbide.cdt.builder.test.errorParsers.TestGcceErrorParser.class);
+		suite.addTestSuite(com.nokia.carbide.cdt.builder.test.errorParsers.TestSBSv2ErrorParser.class);
+		suite.addTestSuite(com.nokia.carbide.cdt.builder.test.errorParsers.TestMakeErrorParser.class);
 		
 		
 		//$JUnit-END$