Add option to set tool name used in messages.

henry2cox · henry2cox · commit b672a74d85ce · 2024-12-06T05:06:29.000-05:00
Reduce confusion when 'geninfo' errors reported when user invoked 'lcov --capture ...'.

Signed-off-by: Henry Cox &lt;henry.cox@mediatek.com&gt;
diff --git a/bin/lcov b/bin/lcov
@@ -817,6 +817,8 @@ sub lcov_geninfo(@)
     # Capture data
     info("Capturing coverage data from " . join(" ", @dir) . "\n");
     @param = (File::Spec->catfile($tool_dir, 'geninfo'), @dir);
+    # make things less confusing for user, by using the name they actually invoked
+    push(@param, '--toolname', $lcovutil::tool_name);
     if ($output_filename) {
         push(@param, "--output-filename", $output_filename);
     }
diff --git a/lib/lcovutil.pm b/lib/lcovutil.pm
@@ -1228,6 +1228,7 @@ our %argCommon = ("tempdir=s"         => \$tempdirname,
                   "help|h|?"    => \$help,
                   "version"     => \$version,
                   'comment=s'   => \@comments,
+                  'toolname=s'  => \$lcovutil::tool_name,
 
                   "function-coverage"    => \$lcovutil::func_coverage,
                   "branch-coverage"      => \$lcovutil::br_coverage,

Original file line number	Diff line number	Diff line change
`@@ -817,6 +817,8 @@ sub lcov_geninfo(@)`
`817`	`817`	`# Capture data`
`818`	`818`	`info("Capturing coverage data from " . join(" ", @dir) . "\n");`
`819`	`819`	`@param = (File::Spec->catfile($tool_dir, 'geninfo'), @dir);`
	`820`	`+ # make things less confusing for user, by using the name they actually invoked`
	`821`	`+ push(@param, '--toolname', $lcovutil::tool_name);`
`820`	`822`	`if ($output_filename) {`
`821`	`823`	`push(@param, "--output-filename", $output_filename);`
`822`	`824`	`}`