Log '--no-external' exclusions: clarify tool action to (hopefully)

reduce confusion.

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

Author: henry2cox

bin/geninfo

@@ -562,13 +562,22 @@ $output_filename = catfile($cwd, $output_filename)
 # Build list of directories to identify external files
 foreach my $entry (@data_directory, $base_directory) {
     next if (!defined($entry));
+    # do not apply substitution patterns to the dir name -
+    #   if user really wants that, they can specify a substitution and/or
+    #   include/exclude patterns
     my $p = solve_relative_path($cwd, $entry);
-    push(@lcovutil::internal_dirs, $p);
+    push(@lcovutil::internal_dirs, $p)
+        unless grep($p, @lcovutil::internal_dirs);
     if (!file_name_is_absolute($entry) &&
         $entry ne $p) {
-        push(@lcovutil::internal_dirs, $entry);
+        push(@lcovutil::internal_dirs, $entry)
+            unless grep($entry, @lcovutil::internal_dirs);
     }
 }
+if (@lcovutil::internal_dirs) {
+    lcovutil::info("Recording 'internal' directories:\n\t" .
+                   join("\n\t", @internal_dirs) . "\n");
+}
 
 # Function is_external() requires all internal_dirs to end with a slash
 foreach my $dir (@lcovutil::internal_dirs) {
@@ -3375,8 +3384,14 @@ sub filter_source_files($)
 
     foreach my $filename (keys(%{$hash})) {
         # Skip external files if requested
-        if (is_external($filename) ||
+        my $external = is_external($filename);
+        if ($external ||
             TraceFile::skipCurrentFile($filename)) {
+            if ($external) {
+                lcovutil::info("Dropping 'external' file '$filename'\n");
+            } else {
+                lcovutil::info("Excluding file '$filename'\n");
+            }
             # Remove file data
             delete($hash->{$filename});
             $lcovutil::excluded_files{$filename} = 1;

lib/lcovutil.pm

@@ -6186,6 +6186,7 @@ sub applyFilters
             unless ('TraceInfo' eq ref($traceInfo));
         my $source_file = $traceInfo->filename();
         if (lcovutil::is_external($source_file)) {
+            lcovutil::info("excluding 'external' file '$source_file'\n");
             delete($self->[FILES]->{$source_file});
             next;
         }