Bugfox: do not push --base-directory onto source-dir list multiple times

henry2cox · henry2cox · commit d97b0ee9e1c3 · 2023-12-12T06:23:38.000-05:00
(issue #254) Signed-off-by: Henry Cox <henry.cox@mediatek.com>
diff --git a/bin/lcov b/bin/lcov
@@ -861,7 +861,11 @@ sub lcov_geninfo(@)
         push(@param, "--build-directory", $b);
     }
     foreach my $s (@ReadCurrentSource::source_directories) {
-        push(@param, "--source-directory", $s);
+        # a bit of a hack:  we pushed the --base-directory argument onto
+        #  the source list - and we need to make sure that we only pass
+        #  it to geninfo once.
+        push(@param, "--source-directory", $s)
+            unless (defined($base_directory) && $s eq $base_directory);
     }
     if ($no_compat_libtool) {
         push(@param, "--no-compat-libtool");

Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,11 @@ sub lcov_geninfo(@)`
`861`	`861`	`push(@param, "--build-directory", $b);`
`862`	`862`	`}`
`863`	`863`	`foreach my $s (@ReadCurrentSource::source_directories) {`
`864`		`- push(@param, "--source-directory", $s);`
	`864`	`+ # a bit of a hack: we pushed the --base-directory argument onto`
	`865`	`+ # the source list - and we need to make sure that we only pass`
	`866`	`+ # it to geninfo once.`
	`867`	`+ push(@param, "--source-directory", $s)`
	`868`	`+ unless (defined($base_directory) && $s eq $base_directory);`
`865`	`869`	`}`
`866`	`870`	`if ($no_compat_libtool) {`
`867`	`871`	`push(@param, "--no-compat-libtool");`