fix bug 8804, add unit tests
authortimkelly
Mon, 06 Apr 2009 14:24:14 -0500
changeset 54 ff58688cad6c
parent 51 da820b19f9da (current diff)
parent 53 fc4ab2e45685 (diff)
child 56 887bd61e1328
fix bug 8804, add unit tests
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt	Mon Apr 06 14:02:48 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt	Mon Apr 06 14:24:14 2009 -0500
@@ -39,4 +39,11 @@
 
 make: *** Waiting for unfinished jobs....
 
-</buildlog>
\ No newline at end of file
+</buildlog>
+
+<![CDATA[
++ C:/APPS/rvct22_616/bin/armlink.exe --diag_suppress 6331 --bpabi --reloc --no_scanlib --datacompressor=off --debug --dll --split --rw-base 0x400000 --symver_soname --soname 'helloworld{000a0000}[e800005a].exe' --entry _E32Startup 'P:/epoc32/release/armv5/udeb/eexe.lib(uc_exe_.o)' -o P:/epoc32/release/armv5/udeb/helloworld.exe.sym --symbols --list P:/epoc32/release/armv5/udeb/helloworld.exe.map --via P:/epoc32/build/helloworld/c_34df0185eb73bae4/helloworld_exe/armv5/udeb/helloworld_udeb_objects.via P:/epoc32/release/armv5/udeb/usrt2_2.lib P:/epoc32/release/armv5/lib/euser.dso P:/epoc32/release/armv5/lib/apparc.dso P:/epoc32/release/armv5/lib/cone.dso P:/epoc32/release/armv5/lib/eikcore.dso P:/epoc32/release/armv5/lib/gdi.dso P:/epoc32/release/armv5/lib/drtaeabi.dso P:/epoc32/release/armv5/lib/dfpaeabi.dso P:/epoc32/release/armv5/lib/dfprvct2_2.dso P:/epoc32/release/armv5/lib/drtrvct2_2.dso 'C:/APPS/rvct22_616/lib/armlib/h_t__uf.l(switch8.o)'
+Fatal error: L6002U: Could not open file P:/epoc32/build/helloworld/c_34df0185eb73bae4/helloworld_exe/armv5/udeb/HelloWorld_AppUi.o: No such file or directory
+Not enough information to list image symbols.
+Finished: 1 information, 0 warning, 0 error and 1 fatal error messages.
+]]>
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.regression.xml	Mon Apr 06 14:02:48 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.regression.xml	Mon Apr 06 14:24:14 2009 -0500
@@ -1,4 +1,6 @@
 <root>
 <!--Error Marker at index 0-->
 <marker_info external_path_string="^EMPTY^" file="^EMPTY^" line_number="-1" message="While Searching for a SPECIFIED DEFFILE: file not found: L:/src/common/generic/app-framework/cone/bwins/CONExu.DEF" severity="1" variable_name="^EMPTY^"/>
+<!--Error Marker at index 1-->
+<marker_info external_path_string="^EMPTY^" file="^EMPTY^" line_number="0" message="Fatal error: L6002U: Could not open file P:/epoc32/build/helloworld/c_34df0185eb73bae4/helloworld_exe/armv5/udeb/HelloWorld_AppUi.o: No such file or directory" severity="3" variable_name="^EMPTY^"/>
 </root>
\ No newline at end of file
--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/AllTests.java	Mon Apr 06 14:02:48 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/AllTests.java	Mon Apr 06 14:24:14 2009 -0500
@@ -27,6 +27,7 @@
 		//$JUnit-BEGIN$
 		suite.addTestSuite(TestRVCTErrorParser.class);
 		suite.addTestSuite(TestMakmakeErrorParser.class);
+		suite.addTestSuite(TestSBSv2ErrorParser.class);
 		//$JUnit-END$
 		return suite;
 	}
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RVCTCompilerErrorParser.java	Mon Apr 06 14:02:48 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RVCTCompilerErrorParser.java	Mon Apr 06 14:24:14 2009 -0500
@@ -39,6 +39,7 @@
 		// e.g. "no source": Error:  #5: cannot open source input file "\CarbideB18_workspace\BlackFlag\group\SRC\dbg_debug_menu.cpp": No such file or directory
 		if (aLine.contains("No such file or directory")){
 			aErrorParserManager.generateMarker(aErrorParserManager.getProject(), 0, aLine, IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
+			return true;
 		}