Find_collisions.pl - modified tool to use 'FC' instead of 'diff' for finding origins. (gcc 'diff' not currently in builds)
authorMattD <mattd@symbian.org>
Mon, 06 Jul 2009 10:58:51 +0100 (2009-07-06)
changeset 230 75af1c9cfd87
parent 229 c3aa5da4cb96
child 231 c75afb49c4d3
Find_collisions.pl - modified tool to use 'FC' instead of 'diff' for finding origins. (gcc 'diff' not currently in builds)
common/tools/analysis/find_collisions.pl
--- a/common/tools/analysis/find_collisions.pl	Thu Jul 02 14:19:57 2009 +0100
+++ b/common/tools/analysis/find_collisions.pl	Mon Jul 06 10:58:51 2009 +0100
@@ -135,30 +135,31 @@
   {
     if(-e $left && -e $right)
     {
-      my $leftdiff = 0;
-      my $rightdiff = 0;
-      open(DIFF,"diff $left $target|") or die "couldn't execute diff";
-      print "diff $left $target\n";
+      my $leftdiff = 1;
+      my $rightdiff = 1;
+      open(DIFF,"fc $left $target|") or die "couldn't execute fc";
+      print "fc $left $target\n";
       
       while(my $line = <DIFF>)
       {
-        if($line =~ m/\S+/)
+        
+        if($line =~ m/FC:\sno\sdifferences\sencountered/i)
         {
-          $leftdiff = 1;
-          print "\t$line";
+          $leftdiff = 0;
         }
+        print "\t$line";
       }
       close DIFF;
 
-      open(DIFF,"diff $right $target|") or die "couldn't execute diff";
-      print "diff $right $target\n";
+      open(DIFF,"fc $right $target|") or die "couldn't execute fc";
+      print "fc $right $target\n";
       while( my $line = <DIFF>)
       {
-        if($line =~ m/\S+/)
+        if($line =~ m/FC:\sno\sdifferences\sencountered/i)
         {
-          $rightdiff = 1;
-         print "\t$line";
+          $rightdiff = 0;
         }
+        print "\t$line";
       }
       close DIFF;