Merge branch '10.5' into 10.6

1 files changed, 20 insertions, 18 deletions

diff --git a/mysql-test/dgcov.pl b/mysql-test/dgcov.pl
index 525db191efa..639f3a5b72a 100755
--- a/mysql-test/dgcov.pl
+++ b/mysql-test/dgcov.pl
@@ -155,7 +155,7 @@ END
 sub gcov_one_file {
   return unless /\.gcda$/;
   unless ($opt_skip_gcov) {
-    $cmd= "gcov -i '$_' 2>/dev/null >/dev/null";
+    $cmd= "gcov -il '$_' 2>/dev/null >/dev/null";
     print STDERR ++$file_no,"\r" if not $opt_verbose and -t STDERR;
     logv "Running: $cmd";
     system($cmd)==0 or die "system($cmd): $? $!";
@@ -167,25 +167,27 @@ sub gcov_one_file {
   {
     return;
   }
-  open FH, '<', "$gcov_file_path" or die "open(<$gcov_file_path): $!";
-  my $fname;
-  while (<FH>) {
-    chomp;
-    if (/^function:/) {
-      next;
-    }
-    if (/^file:/) {
-      $fname=realpath($');
-      next;
-    }
-    next if /^lcount:\d+,-\d+/; # whatever that means
-    unless (/^lcount:(\d+),(\d+)/ and $fname) {
-      warn "unknown line '$_' after running '$cmd'";
-      next;
+  for my $gcov_file (<$_*.gcov>) {
+    open FH, '<', "$gcov_file_path" or die "open(<$gcov_file_path): $!";
+    my $fname;
+    while (<FH>) {
+      chomp;
+      if (/^function:/) {
+        next;
+      }
+      if (/^file:/) {
+        $fname=realpath(-f $' ? $' : $root.$');
+        next;
+      }
+      next if /^lcount:\d+,-\d+/; # whatever that means
+      unless (/^lcount:(\d+),(\d+)/ and $fname) {
+        warn "unknown line '$_' in $gcov_file";
+        next;
+      }
+      $cov{$fname}->{$1}+=$2;
     }
-    $cov{$fname}->{$1}+=$2;
+    close(FH);
   }
-  close(FH);
 }
 
 sub write_coverage {