# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1244473191 -3600
# Node ID f2ac8aeae6bb3745fa78c811bfabccb5b01e23b9
# Parent  247e27021cd0c84f1d1512eaeccb1bd9bfc0d707# Parent  7f5b4e3699cbd99e7393596344a631b32c7e4a33
Merge changes

diff -r 247e27021cd0 -r f2ac8aeae6bb common/tools/analysis/dump_recipe_at_line.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/analysis/dump_recipe_at_line.pl	Mon Jun 08 15:59:51 2009 +0100
@@ -0,0 +1,69 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Matt Davies <mattd@symbian.org>
+#
+# Description:
+# dumprecipe.pl : Gives you the recipe starting with the given line number
+# perl dumprecipe.pl <log> <line>
+#
+# Tool is generally for use with yarp, to look at individual errors, and was written as the logs are too verbose for many editors to handle.
+# As usual, this tool is rough and ready.
+ 
+
+use strict;
+
+my $file = shift @ARGV;
+my $number = shift @ARGV;
+my %numbers;
+if(!-e $number && $number =~ m/^\d+$/)
+{
+  $numbers{$number} = $number;
+}
+else
+{
+  open(NUMBERS, "<$number") or die "Couldn't open $number";
+  while(my $line = <NUMBERS>)
+  {
+    if($line =~ m/(\d+)\s+(\S+)/)
+    {
+      $numbers{$1} = "$2($1)";
+    }
+    elsif($line =~ m/(\d+)/)
+    {
+      $numbers{$1} = $1;
+    }
+  }
+  close NUMBERS;
+}  
+
+
+open(FILE,"<$file") or die "Coudln't open file $file\n";
+my $linecount = 0;
+my $recipe = 0;
+while(my $line = <FILE>)
+{
+  ++$linecount;
+
+  if(!$recipe && defined $numbers{$linecount})
+  {
+    $recipe = $numbers{$linecount};
+  }
+  if($recipe)
+  {
+    print $recipe."\t".$line;
+  }
+  if($line =~ m/<\/recipe>/)
+  {
+    $recipe = 0;
+  }
+}
+#print $linecount;
\ No newline at end of file
diff -r 247e27021cd0 -r f2ac8aeae6bb common/tools/analysis/yarp.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/analysis/yarp.pl	Mon Jun 08 15:59:51 2009 +0100
@@ -0,0 +1,161 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Matt Davies <mattd@symbian.org>
+#
+# Description:
+# YARP - Yet Another Recipe Parser
+# This tool parses Raptor logs looking for failures, and writes a CSV file of the results
+#
+# Usage:
+# perl yarp.pl <logfile> <csvfile>
+#
+# Notes:
+# Currently it won't tell you any info about why it fails, with the exception of arm licence issues.
+# It also uses a lot of memory, so while there is a subroutine for doing multiple files, it's not used, and is out of date.
+# Writing output to a file is hacked in, so it's not too pretty.
+
+use strict;
+use XML::Simple;
+use Data::Dumper;
+
+my @header = qw(line layer component name armlicence platform phase code bldinf mmp target source);
+
+main();
+
+
+sub main()
+{
+  my $filename = shift @ARGV;
+  my $output = shift @ARGV;
+  open(OUT,">$output") or die "Coudn't open $output\n";
+  foreach my $key (@header)
+  {
+    print OUT $key.",";
+  } 
+  print OUT "\n";
+
+  parsefile($filename);
+  close OUT;
+}
+sub scandir()
+{
+  my $path = shift @ARGV;
+  my @files = glob($path."/*compile.log");
+   
+  foreach my $filename (@files)
+  {
+#    print $filename."\n";
+    parsefile($filename);
+  }  
+}
+  
+sub  parsefile($filename)
+{
+    my $filename = shift;
+#    print "Scanning $filename\n";
+    open(FILE,"<$filename") or die "Couldn't open filename\n";
+    my $recipe;
+    my %attempts;
+    my %licenceattempts;
+    my $counter = 0;
+    my $licence = 0;
+    while( my $line = <FILE>)
+    {
+      ++$counter;
+      if($line =~ m/^<recipe\s+(\S.+)>/)
+      {
+        $recipe = XMLin($line."</recipe>");
+        $recipe->{'line'} = $counter;
+#        print Dumper($recipe);
+      }
+      elsif($line =~ m/<\/recipe>/)
+      {
+        if(defined $recipe)
+        {         
+#          if($recipe->{'exit'} !~ m/ok/)
+          if($recipe->{'exit'} =~ m/failed/)
+          {
+#            if($recipe->{'target'} =~ m/\S:epoc32\//i) 
+#               && $recipe->{'target'} !~ m/\S:epoc32\/build/i)
+            {
+              DumpRecipe($recipe);
+
+            }
+          }         
+        $recipe = undef;
+        }
+      }
+      elsif($line =~ m/Error:\sC3397E:\s/) #ARM Licence error code...
+      {
+        ++$licence;
+        if(defined $recipe)
+        {
+          $recipe->{'armlicence'} = 1;
+        }  
+      }
+      elsif($line =~ m/(<status\s.+\/>)/)
+      {
+        my $status = XMLin($1);
+        if(defined $recipe)
+        {
+          $recipe->{'exit'} = $status->{'exit'};
+          $recipe->{'attempt'} = $status->{'attempt'};
+          if(defined $status->{'code'})
+          {
+            $recipe->{'code'} = $status->{'code'}; 
+          }
+          if(!defined $attempts{$status->{'attempt'}})
+            {
+              $attempts{$status->{'attempt'}} = 0;
+            }
+          $attempts{$status->{'attempt'}} = $attempts{$status->{'attempt'}} + 1;
+          if(defined $recipe->{'armlicence'})
+          {
+            if(!defined $licenceattempts{$status->{'attempt'}})
+              {
+                $licenceattempts{$status->{'attempt'}} = 0;
+              }
+            $licenceattempts{$status->{'attempt'}} = $licenceattempts{$status->{'attempt'}} + 1;
+          }               
+        }      
+      }
+    }
+  close FILE;
+  print OUT "\n\nSummaries\n\n";
+  foreach my $attempt (sort keys %attempts)
+  {
+    print OUT "Overall attempts: $attempt,".$attempts{$attempt}.",\n";
+  }
+  foreach my $attempt (sort keys %licenceattempts)
+  {
+    print OUT "ARM Licence Fail attempts: $attempt,".$licenceattempts{$attempt}.",\n";
+  }
+  print OUT "Total ARM Licence failures,$licence\n";
+  
+   
+}
+
+sub DumpRecipe($)
+{
+  my $recipe = shift;
+  foreach my $key (@header)
+  {
+    if(defined $recipe->{$key})
+    {
+      print OUT $recipe->{$key};
+    }
+    print OUT ",";
+  }
+  print OUT "\n";            
+  #print Dumper($recipe);
+
+}
diff -r 247e27021cd0 -r f2ac8aeae6bb common/tools/ats/ats3_testdrop.pl
--- a/common/tools/ats/ats3_testdrop.pl	Mon Jun 08 15:58:51 2009 +0100
+++ b/common/tools/ats/ats3_testdrop.pl	Mon Jun 08 15:59:51 2009 +0100
@@ -103,7 +103,7 @@
 $url .= "&schedule=$schedule", if (defined($schedule));
 # Post URL to server with cURL.
 my $curl_cmd = "curl \"$url\"";
-my $curl_response = `$curl_cmd 2>$1`;
+my $curl_response = `$curl_cmd 2>&1`;
 die("\nTest drop failed: $!\n"), if ($?);
 if ($curl_response =~ /(TEST_RUN_REF_ID=\d+)/) {
     #extract test run id from cURL response.