Re: [PATCH 1/3] checkkconfigsymbols.py: Fix the '--ignore' option

From: Masahiro Yamada
Date: Tue Aug 24 2021 - 09:26:32 EST


On Mon, Aug 23, 2021 at 4:22 AM Ariel Marcovitch
<arielmarcovitch@xxxxxxxxx> wrote:
>
> It seems like the implementation of the --ignore option is broken.
>
> In check_symbols_helper, when going through the list of files, a file is
> added to the list of source files to check if it matches the ignore
> pattern. Instead, as stated in the comment below this condition, the
> file should be added if it doesn't match the pattern.
>
> This means that when providing an ignore pattern, the only files that
> will be checked will be the ones we want the ignore, in addition to the
> Kconfig files that don't match the pattern (the check in
> parse_kconfig_files is done right)
>
> Signed-off-by: Ariel Marcovitch <arielmarcovitch@xxxxxxxxx>
> ---
> scripts/checkkconfigsymbols.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py
> index 1548f9ce4682..b9b0f15e5880 100755
> --- a/scripts/checkkconfigsymbols.py
> +++ b/scripts/checkkconfigsymbols.py
> @@ -329,7 +329,7 @@ def check_symbols_helper(pool, ignore):
> if REGEX_FILE_KCONFIG.match(gitfile):
> kconfig_files.append(gitfile)
> else:
> - if ignore and not re.match(ignore, gitfile):
> + if ignore and re.match(ignore, gitfile):
> continue

This fix seems correct.
Applied to linux-kbuild.



> # add source files that do not match the ignore pattern
> source_files.append(gitfile)
> --
> 2.25.1
>


--
Best Regards
Masahiro Yamada