If directory found anywhere that tracefile is expected, then find

all the tracefiles in the indicated subdirectory (aggregating them).
This feature makes it much easier to find and reuse baseline and/or
current coverage data which was is held in a per-testsuite DB.

Signed-off-by: Henry Cox <[email protected]>

Author: henry2cox

bin/geninfo

@@ -942,19 +942,23 @@ sub find_files
             lcovutil::info("Scanning $directory for $ext files ...\n");
 
             my $now = Time::HiRes::gettimeofday();
-            my @found =
-                `find "$directory" $maxdepth $follow -name \\*$ext -type f -o -name \\*$ext -type l 2>$lcovutil::devnull`;
+            my ($stdout, $stderr, $code) = Capture::Tiny::capture {
+                system(
+                    "find '$directory' $maxdepth $follow -name \\*$ext -type f -o -name \\*$ext -type l"
+                );
+            };
             lcovutil::ignorable_error($lcovutil::ERROR_UTILITY,
-                                      "error in 'find \"$directory\" ...': $!")
-                if ($?);
+                                  "error in 'find \"$directory\" ...': $stderr")
+                if ($code);
+
             my $time = Time::HiRes::gettimeofday() - $now;
             if (exists($lcovutil::profileData{find}) &&
                 exists($lcovutil::profileData{find}{$directory})) {
                 $lcovutil::profileData{find}{$directory} += $time;
             } else {
                 $lcovutil::profileData{find}{$directory} = $time;
             }
-            chomp(@found);
+            my @found = split(' ', $stdout);
             if (!@found) {
                 if (!defined($processGcno) || $processGcno != 2) {
                     $self->[2]->{$directory} = [

lib/lcovutil.pm

@@ -311,6 +311,8 @@ our %languageExtensions = ('c'      => 'c|h|i||C|H|I|icc|cpp|cc|cxx|hh|hpp|hxx',
                            'python' => 'py',
                            'java'   => 'java');
 
+our $info_file_pattern = '*.info';
+
 # don't look more than 10 lines ahead when filtering (default)
 our $source_filter_lookahead = 10;
 # by default, don't treat expressions containing bitwise operators '|', '&', '~'
@@ -1079,6 +1081,7 @@ my %rc_common = (
              "perl_file_extensions"   => \$perlExtensions,
              "python_file_extensions" => \$pythonExtensions,
              "java_file_extensions"   => \$javaExtensions,
+             'info_file_pattern'      => \$info_file_pattern,
              "filter_lookahead"       => \$lcovutil::source_filter_lookahead,
              "filter_bitwise_conditional" =>
         \$lcovutil::source_filter_bitwise_are_conditional,
@@ -7127,6 +7130,7 @@ our $segmentIdx = 0;
 sub find_from_glob
 {
     my @merge;
+    die("no files specified") unless (@_);
     foreach my $pattern (@_) {
 
         if (-f $pattern) {
@@ -7138,11 +7142,32 @@ sub find_from_glob
             unless $^O =~ /Win/;
 
         my @files = glob($pattern);   # perl returns files in ASCII sorted order
+
         lcovutil::ignorable_error($lcovutil::ERROR_EMPTY,
                                   "no files matching pattern $pattern")
             unless scalar(@files);
-        foreach my $f (@files) {
-            if (!(-r $f || -f $f)) {
+        for (my $i = 0; $i <= $#files; ++$i) {
+            my $f = $files[$i];
+            if (-d $f) {
+                my $cmd =
+                    "find '$f' -name '$lcovutil::info_file_pattern' -type f";
+                my ($stdout, $stderr, $code) = Capture::Tiny::capture {
+                    system($cmd);
+                };
+                # can fail due to unreadable entry - but might still
+                #  have returned data to process
+                lcovutil::ignorable_error($lcovutil::ERROR_UTILITY,
+                                          "error in \"$cmd\": $stderr")
+                    if $code;
+                my @found = split(' ', $stdout);
+                lcovutil::ignorable_error($lcovutil::ERROR_EMPTY,
+                    "no files matching '$lcovutil::info_file_pattern' found in $f"
+                ) unless (@found);
+                push(@files, @found);
+                next;
+            }
+
+            unless (-r $f || -f $f) {
                 lcovutil::ignorable_error($lcovutil::ERROR_MISSING,
                      "'$f' found from pattern '$pattern' is not a readable file"
                 );
@@ -7151,6 +7176,10 @@ sub find_from_glob
             push(@merge, $f);
         }
     }
+    lcovutil::ignorable_error($lcovutil::ERROR_EMPTY,
+                        "no matching file found in '['" . join(', ', @_) . "]'")
+        unless (@merge);
+
     return @merge;
 }
 

man/genhtml.1

@@ -938,6 +938,14 @@ The coverage data files specified by
 .I baseline\-file\-pattern
 is read and used as the baseline for classifying the change in coverage represented by the coverage counts in
 .IR tracefile\-patterns .
+If
+.I baseline\-file\-pattern
+is a directory, then genhtml will search the directory for all files ending in '.info'.
+See the
+.I info_file_extension
+section in
+.B man(5) lcovrc
+for how to change this pattern.
 
 In general, you should specify a diff file in unified diff format via
 .B \-\-diff\-file

man/lcovrc.5

@@ -198,6 +198,11 @@ max_message_count = 100
 .br
 #warn_once_per_file = 1
 
+# extension associated with lcov trce files
+.br
+#info_file_pattern = *.info
+.br
+
 # list of file extensions which should be treated as C/C++ code
 .br
 # (comma-separated list)
@@ -799,6 +804,14 @@ This option is used by genhtml and lcov.
 
 .PP
 
+.BR info_file_pattern " ="
+.IR str
+.IP
+Specify a glob-match pattern associated with lcov trace files (suitable as an argument to 'find'.
+If not specified, the default is '*.info'.
+
+.PP
+
 .BR c_file_extensions " ="
 .IR str[,str]+
 .IP

tests/lcov/errs/errs.sh

@@ -97,6 +97,7 @@ if [ "${VER[0]}" -lt 5 ] ; then
 fi
 
 rm -f  *.log *.json dumper*
+rm -rf emptyDir
 
 if [ "x$COVER" != 'x' ] && [ 0 != $LOCAL_COVERAGE ] ; then
     cover -delete
@@ -242,6 +243,56 @@ for f in exceptionBranch ; do
     fi
 done
 
+mkdir -p emptyDir
+
+echo lcov $LCOV_OPTS -a emptyDir -a exceptionBranch1.info -o emptyDir.info
+$COVER $LCOV_TOOL $LCOV_OPTS -a emptyDir -a exceptionBranch1.info -o emptyDir.info 2>&1 | tee emptyDir.log
+if [ 0 == ${PIPESTATUS[0]} ] ; then
+    echo "failed to notice empty dir"
+    status=1
+    if [ 0 == $KEEP_GOING ] ; then
+        exit $status
+    fi
+fi
+grep 'no files matching' emptyDir.log
+if [ 0 != $? ] ; then
+    echo "did not find expected empty dir message"
+fi
+echo lcov $LCOV_OPTS -a emptyDir -a exceptionBranch1.info -o emptyDir.info --ignore empty
+$COVER $LCOV_TOOL $LCOV_OPTS -a emptyDir -a exceptionBranch1.info -o emptyDir.info --ignore empty 2>&1 | tee emptyDir2.log
+if [ 0 != ${PIPESTATUS[0]} ] ; then
+    echo "failed to ignore empty dir"
+    status=1
+    if [ 0 == $KEEP_GOING ] ; then
+        exit $status
+    fi
+fi
+
+# trigger error from unreadable directory
+chmod ugo-rx emptyDir
+echo lcov $LCOV_OPTS -a emptyDir -a exceptionBranch1.info -o emptyDir.info
+$COVER $LCOV_TOOL $LCOV_OPTS -a emptyDir -a exceptionBranch1.info -o emptyDir.info 2>&1 | tee noRead.log
+if [ 0 == ${PIPESTATUS[0]} ] ; then
+    echo "failed to notice unreadable"
+    status=1
+    if [ 0 == $KEEP_GOING ] ; then
+        exit $status
+    fi
+fi
+grep 'error in "find' noRead.log
+if [ 0 != $? ] ; then
+    echo "did not find expected unreadable dir message"
+fi
+echo lcov $LCOV_OPTS -a emptyDir -a exceptionBranch1.info -o emptyDir.info --ignore utility,empty
+$COVER $LCOV_TOOL $LCOV_OPTS -a emptyDir -a exceptionBranch1.info -o emptyDir.info --ignore utility,empty 2>&1 | tee noRead2.log
+if [ 0 != ${PIPESTATUS[0]} ] ; then
+    echo "failed to ignore unreadable dir"
+    status=1
+    if [ 0 == $KEEP_GOING ] ; then
+        exit $status
+    fi
+fi
+
 
 if [ 0 == $status ] ; then
     echo "Tests passed"