# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1245427976 -3600
# Node ID 62976b2583f7d04735cc292782113fd605bf3aa6
# Parent  863cc9c0bf03277d60a965e66543b81072714db3
Fix for Error doesn't correctly report the number of failing raptor recipes

diff -r 863cc9c0bf03 -r 62976b2583f7 common/build.xml
--- a/common/build.xml	Fri Jun 19 10:10:05 2009 +0100
+++ b/common/build.xml	Fri Jun 19 17:12:56 2009 +0100
@@ -633,14 +633,11 @@
         <exec executable="cmd" output="${build.drive}/output/logs/analysis/tmp_yarp_files.csv" append="true">
           <arg value="/c"/>
           <arg value="echo"/>
-          <arg value="${yarpfile_short},${sf.spec.publish.networkdrive}\${sf.spec.job.name}\builds\${sf.spec.job.codeline}\${build.id}\logs\analysis\${yarpfile}"/>
+          <arg value="${yarpfile_short},${sf.spec.publish.networkdrive}\${sf.spec.job.name}\builds\${sf.spec.job.codeline}\${build.id}\logs\analysis\${yarpfile},${build.drive}\output\logs\analysis\${yarpfile}"/>
         </exec>
       </sequential>
     </for>
     
-    <!-- fake build results file -->
-    <!-- copy file="D:\zoo\fake_results_file\sf-run-analysis.xml" todir="${build.drive}/output/logs" failonerror="false" verbose="true"/ -->
-    
     <exec executable="perl" dir="${build.drive}" failonerror="false" outputproperty="sf.job.totalyarperrors">
       <arg value="${sf.common.config.dir}/tools/analysis/parse_yarp_files.pl"/>
       <arg value="${build.drive}/output/logs/analysis/tmp_yarp_files.csv"/>
@@ -650,7 +647,7 @@
     <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-run-analysis.xml.ftl" outputFile="${build.drive}/output/logs/sf-run-analysis.xml">
       <data expandProperties="yes">
         ant: antProperties()
-        files: csv(${build.drive}/output/logs/analysis/tmp_yarp_files.csv,{separator:',',headers:[name,path]})
+        files: csv(${build.drive}/output/logs/analysis/tmp_yarp_files.csv,{separator:',',headers:[name,path,localpath]})
       </data>
     </fmpp>
 
diff -r 863cc9c0bf03 -r 62976b2583f7 common/tools/analysis/parse_yarp_files.pl
--- a/common/tools/analysis/parse_yarp_files.pl	Fri Jun 19 10:10:05 2009 +0100
+++ b/common/tools/analysis/parse_yarp_files.pl	Fri Jun 19 17:12:56 2009 +0100
@@ -3,7 +3,7 @@
 open(FILE, $ARGV[0]);
 while ( <FILE> )
 {
-	if ( m/[^,]*,([^,]*)/ )
+	if ( m/^[^,]*,[^,]*,([^,]*)/ )
 	{
 		my $sFile = $1;
 		chomp $sFile;
@@ -25,7 +25,7 @@
 	{
 		if ( m/^Raptor recipe failures:\s+(\d+)$/ )
 		{
-			#print "Attempt: $1 Errors: $2\n";
+#			print "Raptor recipe failures: $1\n";
 			$nRecipeErrors = $1;
 		}
 	}