diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-18 05:15:29 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-18 05:15:29 +0400 |
| commit | 6e0da2750cd4f2af103fd79bdce0fdbf739f49d0 (patch) | |
| tree | a1b18c2132c5c69a6f26c17d93d6a0394d36d7cf /mysql-test/lib | |
| parent | b495b3db2346a98650946ad5907ba3fe164eadc7 (diff) | |
| download | mariadb-git-6e0da2750cd4f2af103fd79bdce0fdbf739f49d0.tar.gz | |
Gcov support improvements
- address review feedback (cleaner perl code)
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_gcov.pl | 3 | ||||
| -rwxr-xr-x | mysql-test/lib/process-purecov-annotations.pl | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/lib/mtr_gcov.pl b/mysql-test/lib/mtr_gcov.pl index ef1067bfd27..2f211b7566d 100644 --- a/mysql-test/lib/mtr_gcov.pl +++ b/mysql-test/lib/mtr_gcov.pl @@ -64,7 +64,8 @@ sub gcov_collect ($$$) { $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); } diff --git a/mysql-test/lib/process-purecov-annotations.pl b/mysql-test/lib/process-purecov-annotations.pl index 843d1d2f130..d533bd02fd6 100755 --- a/mysql-test/lib/process-purecov-annotations.pl +++ b/mysql-test/lib/process-purecov-annotations.pl @@ -47,7 +47,7 @@ foreach my $in_file_name ( @ARGV ) # 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 @@ foreach my $in_file_name ( @ARGV ) } 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); } |