[igt-dev] [PATCH 10/12] code_cov_parse_info: fix --show-lines logic

Andrzej Hajda andrzej.hajda at intel.com
Mon Apr 11 11:57:27 UTC 2022



On 04.04.2022 08:26, Mauro Carvalho Chehab wrote:
> From: Mauro Carvalho Chehab <mchehab at kernel.org>
>
> print_code_coverage function needs to first read the number
> of lines and then simplify the $file by removing its prefix.
>
> Without that, it ends trying to access an uninitiated value,
> leading to warnings and not doing what's expected.
>
> While here, also check if the ln data is valid, just in case
> the .info file might have some FN field(s) missing.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
> ---
>   scripts/code_cov_parse_info | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/code_cov_parse_info b/scripts/code_cov_parse_info
> index c8284a297b33..7987b0068e88 100755
> --- a/scripts/code_cov_parse_info
> +++ b/scripts/code_cov_parse_info
> @@ -378,8 +378,13 @@ sub print_code_coverage($$$)
>   			}
>   
>   			if ($show_lines) {
> +				my $ln = $all_func{$func}{$file}->{ln};
>   				$file =~ s,$prefix,linux/,;
> -				$name = "$func() from $file:" . $all_func{$func}{$file}->{ln};
> +				if ($ln) {
> +					$name = "$func() from $file:" . $ln;
> +				} else {
> +					$name = "$func() from $file";
> +				}

$name = "$func() from $file";

$name .= ":" . $ln if ($ln);

Would be more compact.

Anyway:
Reviewed-by: Andrzej Hajda <andrzej.hajda at intel.com>

Regards
Andrzej


>   			} elsif (scalar @keys > 1) {
>   				$file =~ s,$prefix,linux/,;
>   				$name = "$func() from $file:";



More information about the igt-dev mailing list