At file:///home/psergey/dev/maria-5.1/ ------------------------------------------------------------ revno: 2732 revision-id: psergey@askmonty.org-20090918011529-3d7glu6ot7n0xqc9 parent: igor@mysql.com-20090909181131-6jb3y48zxnz42zyb committer: Sergey Petrunya <psergey@askmonty.org> 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 file 'mysql-test/lib/mtr_gcov.pl' --- a/mysql-test/lib/mtr_gcov.pl 2009-08-25 15:02:55 +0000 +++ b/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' --- a/mysql-test/lib/process-purecov-annotations.pl 2009-08-25 15:02:55 +0000 +++ b/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); }