interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Antonio Borneo 2022-09-20 12:08:55 +02:00
parent b89cf71e2b
commit bb8d37ddf1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/scripts/checkpatch.pl
View File

@ -995,8 +995,10 @@ sub read_words {
# OpenOCD specific: Begin: Load list of allowed CamelCase symbols # OpenOCD specific: Begin: Load list of allowed CamelCase symbols
if (show_type("CAMELCASE")) { if (show_type("CAMELCASE")) {
my $allowed_camelcase_file = "$root/tools/scripts/camelcase.txt"; my $allowed_camelcase_file = "tools/scripts/camelcase.txt";
if (open(my $words, '<', $allowed_camelcase_file)) { if (!$root) {
warn "Ignore list of allowed camelcase symbols.\n";
} elsif (open(my $words, '<', "$root/$allowed_camelcase_file")) {
while (<$words>) { while (<$words>) {
my $line = $_; my $line = $_;
@ -1012,9 +1014,9 @@ if (show_type("CAMELCASE")) {
$camelcase{$line} = 1; $camelcase{$line} = 1;
} }
close($allowed_camelcase_file); close("$root/$allowed_camelcase_file");
} else { } else {
warn "No camelcase symbols to ignore - file '$allowed_camelcase_file': $!\n"; warn "Failed opening file '$root/$allowed_camelcase_file': $!\n";
} }
} }
# OpenOCD specific: End # OpenOCD specific: End