From bb8d37ddf12a2ad76ede129b63522bfa2940d34e Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Tue, 20 Sep 2022 12:08:55 +0200 Subject: [PATCH] checkpatch: fix for flag --no-tree When checkpatch is run with command line flag --no-tree, it cannot find local 'companion' files and has to skip loading them. This has caused issues with change https://review.openocd.org/7211 on jenkins. Skip loading 'tools/scripts/camelcase.txt' with flag --no-tree. While there, rewrite the associated error message. Change-Id: I6ede7b16f9ccd77b9118fd9be7ada07a1ac96952 Signed-off-by: Antonio Borneo Reviewed-on: https://review.openocd.org/c/openocd/+/7212 Tested-by: jenkins --- tools/scripts/checkpatch.pl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl index 10b0b8c257..9dda61cde0 100755 --- a/tools/scripts/checkpatch.pl +++ b/tools/scripts/checkpatch.pl @@ -995,8 +995,10 @@ sub read_words { # OpenOCD specific: Begin: Load list of allowed CamelCase symbols if (show_type("CAMELCASE")) { - my $allowed_camelcase_file = "$root/tools/scripts/camelcase.txt"; - if (open(my $words, '<', $allowed_camelcase_file)) { + my $allowed_camelcase_file = "tools/scripts/camelcase.txt"; + if (!$root) { + warn "Ignore list of allowed camelcase symbols.\n"; + } elsif (open(my $words, '<', "$root/$allowed_camelcase_file")) { while (<$words>) { my $line = $_; @@ -1012,9 +1014,9 @@ if (show_type("CAMELCASE")) { $camelcase{$line} = 1; } - close($allowed_camelcase_file); + close("$root/$allowed_camelcase_file"); } else { - warn "No camelcase symbols to ignore - file '$allowed_camelcase_file': $!\n"; + warn "Failed opening file '$root/$allowed_camelcase_file': $!\n"; } } # OpenOCD specific: End -- 2.30.2