maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2732
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: maria-5.1
timestamp: Fri 2009-09-18 05:15:29 +0400
message:
  Gcov support improvements
  - address review feedback (cleaner perl code)
modified:
  mysql-test/lib/mtr_gcov.pl
  mysql-test/lib/process-purecov-annotations.pl


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

=== modified file 'mysql-test/lib/mtr_gcov.pl'
--- mysql-test/lib/mtr_gcov.pl	2009-08-25 15:02:55 +0000
+++ mysql-test/lib/mtr_gcov.pl	2009-09-18 01:15:29 +0000
@@ -64,7 +64,8 @@
 	$dir_reported= 1;
       }
       system("$gcov $f 2>>$start_dir/$gcov_err >>$start_dir/$gcov_msg");
-      system("perl $basedir/mysql-test/lib/process-purecov-annotations.pl $f.gcov");
+      system("perl", "$basedir/mysql-test/lib/process-purecov-annotations.pl", "$f.gcov");
+
     }
     chdir($start_dir);
   }

=== modified file 'mysql-test/lib/process-purecov-annotations.pl'
--- mysql-test/lib/process-purecov-annotations.pl	2009-08-25 15:02:55 +0000
+++ mysql-test/lib/process-purecov-annotations.pl	2009-09-18 01:15:29 +0000
@@ -47,7 +47,7 @@
     #
     my @arr= split(/:/, $line);
     if ($skipping || $line =~ /purecov: *(inspected|deadcode)/ || 
-        $arr[2] =~ m/^{ */)
+        $arr[2] =~ m/^{ *$/)
     {
       # Change '####' to '-'.
       $arr[0] =~ s/#####/    -/g;
@@ -57,8 +57,7 @@
   }
   close(IN);
   close(OUT);
-  system("cat $out_file_name > $in_file_name");
-  system("rm $out_file_name");
+  system("mv", "-f", $out_file_name, $in_file_name);
 }