Commit 6e0da275 authored by Sergey Petrunya's avatar Sergey Petrunya

Gcov support improvements

- address review feedback (cleaner perl code)
parent b495b3db
...@@ -64,7 +64,8 @@ sub gcov_collect ($$$) { ...@@ -64,7 +64,8 @@ sub gcov_collect ($$$) {
$dir_reported= 1; $dir_reported= 1;
} }
system("$gcov $f 2>>$start_dir/$gcov_err >>$start_dir/$gcov_msg"); 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); chdir($start_dir);
} }
......
...@@ -47,7 +47,7 @@ foreach my $in_file_name ( @ARGV ) ...@@ -47,7 +47,7 @@ foreach my $in_file_name ( @ARGV )
# #
my @arr= split(/:/, $line); my @arr= split(/:/, $line);
if ($skipping || $line =~ /purecov: *(inspected|deadcode)/ || if ($skipping || $line =~ /purecov: *(inspected|deadcode)/ ||
$arr[2] =~ m/^{ */) $arr[2] =~ m/^{ *$/)
{ {
# Change '####' to '-'. # Change '####' to '-'.
$arr[0] =~ s/#####/ -/g; $arr[0] =~ s/#####/ -/g;
...@@ -57,8 +57,7 @@ foreach my $in_file_name ( @ARGV ) ...@@ -57,8 +57,7 @@ foreach my $in_file_name ( @ARGV )
} }
close(IN); close(IN);
close(OUT); close(OUT);
system("cat $out_file_name > $in_file_name"); system("mv", "-f", $out_file_name, $in_file_name);
system("rm $out_file_name");
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment