diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2022-09-20 12:08:55 +0200 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2022-09-23 21:19:44 +0000 |
| commit | bb8d37ddf12a2ad76ede129b63522bfa2940d34e (patch) | |
| tree | 4c8e864333fe7b6e7dd7eb3b44853593bc07e62f /tools | |
| parent | b89cf71e2b5e4dc2c31cf085aec7a19515e2a9d6 (diff) | |
| download | riscv-openocd-bb8d37ddf12a2ad76ede129b63522bfa2940d34e.zip riscv-openocd-bb8d37ddf12a2ad76ede129b63522bfa2940d34e.tar.gz riscv-openocd-bb8d37ddf12a2ad76ede129b63522bfa2940d34e.tar.bz2 | |
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 <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7212
Tested-by: jenkins
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/scripts/checkpatch.pl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl index 10b0b8c..9dda61c 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 |