Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36626 )
Change subject: util/lint/kconfig_lint: Handle glob prefix and suffix ......................................................................
util/lint/kconfig_lint: Handle glob prefix and suffix
Change-Id: I9067a95ff171d6da58583b3d4f15596b4584d937 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M util/lint/kconfig_lint 1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/36626/1
diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index 47f0494..9ab05db 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -1213,9 +1213,11 @@ my @dir_file_data;
#recursively handle coreboot's new source glob operator - if ( $input_file =~ /^(.*?)/*/(.*)$/ ) { + if ( $input_file =~ /^(.*?)/(\w*)*(\w*)/(.*)$/ ) { my $dir_prefix = $1; - my $dir_suffix = $2; + my $dir_glob_prefix = $2; + my $dir_glob_suffix = $3; + my $dir_suffix = $4; if ( -d "$dir_prefix" ) {
opendir( D, "$dir_prefix" ) || die "Can't open directory '$dir_prefix'\n"; @@ -1225,7 +1227,8 @@ while ( my $directory = shift @dirlist ) {
#ignore non-directory files - if ( ( -d "$dir_prefix/$directory" ) && !( $directory =~ /^..*/ ) ) { + if ( ( -d "$dir_prefix/$directory" ) && !( $directory =~ /^..*/ ) + && ( $directory =~ /$dir_glob_prefix.*$dir_glob_suffix/ ) ) { push @dir_file_data, load_kconfig_file( "$dir_prefix/$directory/$dir_suffix", $input_file, $loadline, 1, $loadfile, $loadline );
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36626 )
Change subject: util/lint/kconfig_lint: Handle glob prefix and suffix ......................................................................
Patch Set 1: Code-Review+1
(2 comments)
Looks good, apart from the escaping, see inline comments...
https://review.coreboot.org/c/coreboot/+/36626/1/util/lint/kconfig_lint File util/lint/kconfig_lint:
https://review.coreboot.org/c/coreboot/+/36626/1/util/lint/kconfig_lint@1231 PS1, Line 1231: $dir_glob_prefix My google-foo says we should escape the variables (in case they contain regexp-special characters), e.g. \Q$dir_glob_prefix\E
https://review.coreboot.org/c/coreboot/+/36626/1/util/lint/kconfig_lint@1231 PS1, Line 1231: looks like this file uses spaces only for indentation
Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36626
to look at the new patch set (#2).
Change subject: util/lint/kconfig_lint: Handle glob prefix and suffix ......................................................................
util/lint/kconfig_lint: Handle glob prefix and suffix
Change-Id: I9067a95ff171d6da58583b3d4f15596b4584d937 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M util/lint/kconfig_lint 1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/36626/2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36626 )
Change subject: util/lint/kconfig_lint: Handle glob prefix and suffix ......................................................................
Patch Set 2: Code-Review+2
(2 comments)
https://review.coreboot.org/c/coreboot/+/36626/1/util/lint/kconfig_lint File util/lint/kconfig_lint:
https://review.coreboot.org/c/coreboot/+/36626/1/util/lint/kconfig_lint@1231 PS1, Line 1231: $dir_glob_prefix
My google-foo says we should escape the variables (in case they contain […]
Done
https://review.coreboot.org/c/coreboot/+/36626/1/util/lint/kconfig_lint@1231 PS1, Line 1231:
looks like this file uses spaces only for indentation
Done
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36626 )
Change subject: util/lint/kconfig_lint: Handle glob prefix and suffix ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36626 )
Change subject: util/lint/kconfig_lint: Handle glob prefix and suffix ......................................................................
util/lint/kconfig_lint: Handle glob prefix and suffix
Change-Id: I9067a95ff171d6da58583b3d4f15596b4584d937 Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/36626 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Martin Roth martinroth@google.com --- M util/lint/kconfig_lint 1 file changed, 6 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved Nico Huber: Looks good to me, approved
diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index 47f0494..1545c82 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -1213,9 +1213,11 @@ my @dir_file_data;
#recursively handle coreboot's new source glob operator - if ( $input_file =~ /^(.*?)/*/(.*)$/ ) { + if ( $input_file =~ /^(.*?)/(\w*)*(\w*)/(.*)$/ ) { my $dir_prefix = $1; - my $dir_suffix = $2; + my $dir_glob_prefix = $2; + my $dir_glob_suffix = $3; + my $dir_suffix = $4; if ( -d "$dir_prefix" ) {
opendir( D, "$dir_prefix" ) || die "Can't open directory '$dir_prefix'\n"; @@ -1225,7 +1227,8 @@ while ( my $directory = shift @dirlist ) {
#ignore non-directory files - if ( ( -d "$dir_prefix/$directory" ) && !( $directory =~ /^..*/ ) ) { + if ( ( -d "$dir_prefix/$directory" ) && !( $directory =~ /^..*/ ) + && ( $directory =~ /\Q$dir_glob_prefix\E.*\Q$dir_glob_suffix\E/ ) ) { push @dir_file_data, load_kconfig_file( "$dir_prefix/$directory/$dir_suffix", $input_file, $loadline, 1, $loadfile, $loadline );
-
Arthur Heymans (Code Review) -
Martin Roth (Code Review)
-
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)