OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

checkpatch: fix acpi check with multiple file name

Browse Source 
Using global expected/nonexpected values causes
false positives when testing multiple patches in one
checkpatch run: one patch can change expected,
another one non-expected.

Use local variables within process() to fix that.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2020-05-04 07:22:49 -04:00
parent 0ac2e63575
commit e625ba2a41
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/checkpatch.pl
View File

@ -35,8 +35,6 @@ my $summary_file = 0;
my $root; my $root;
my %debug; my %debug;
my $help = 0; my $help = 0;
my $acpi_testexpected;
my $acpi_nontestexpected;
sub help { sub help {
my ($exitcode) = @_; my ($exitcode) = @_;
@ -1261,21 +1259,22 @@ sub WARN {
# According to tests/qtest/bios-tables-test.c: do not # According to tests/qtest/bios-tables-test.c: do not
# change expected file in the same commit with adding test # change expected file in the same commit with adding test
sub checkfilename { sub checkfilename {
my ($name) = @_; my ($name, $acpi_testexpected, $acpi_nontestexpected) = @_;
if ($name =~ m#^tests/data/acpi/# and if ($name =~ m#^tests/data/acpi/# and
# make exception for a shell script that rebuilds the files # make exception for a shell script that rebuilds the files
not $name =~ m#^\.sh$# or not $name =~ m#^\.sh$# or
$name =~ m#^tests/qtest/bios-tables-test-allowed-diff.h$#) { $name =~ m#^tests/qtest/bios-tables-test-allowed-diff.h$#) {
$acpi_testexpected = $name; $$acpi_testexpected = $name;
} else { } else {
$acpi_nontestexpected = $name; $$acpi_nontestexpected = $name;
} }
if (defined $acpi_testexpected and defined $acpi_nontestexpected) { if (defined $$acpi_testexpected and defined $$acpi_nontestexpected) {
ERROR("Do not add expected files together with tests, " . ERROR("Do not add expected files together with tests, " .
"follow instructions in " . "follow instructions in " .
"tests/qtest/bios-tables-test.c: both " . "tests/qtest/bios-tables-test.c: both " .
$acpi_testexpected . " and " . $$acpi_testexpected . " and " .
$acpi_nontestexpected . " found\n"); $$acpi_nontestexpected . " found\n");
} }
} }
@ -1325,6 +1324,9 @@ sub process {
my %suppress_whiletrailers; my %suppress_whiletrailers;
my %suppress_export; my %suppress_export;
my $acpi_testexpected;
my $acpi_nontestexpected;
# Pre-scan the patch sanitizing the lines. # Pre-scan the patch sanitizing the lines.
sanitise_line_reset(); sanitise_line_reset();
@ -1454,11 +1456,11 @@ sub process {
if ($line =~ /^diff --git.*?(\S+)$/) { if ($line =~ /^diff --git.*?(\S+)$/) {
$realfile = $1; $realfile = $1;
$realfile =~ s@^([^/]*)/@@ if (!$file); $realfile =~ s@^([^/]*)/@@ if (!$file);
checkfilename($realfile); checkfilename($realfile, \$acpi_testexpected, \$acpi_nontestexpected);
} elsif ($line =~ /^\+\+\+\s+(\S+)/) { } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
$realfile = $1; $realfile = $1;
$realfile =~ s@^([^/]*)/@@ if (!$file); $realfile =~ s@^([^/]*)/@@ if (!$file);
checkfilename($realfile); checkfilename($realfile, \$acpi_testexpected, \$acpi_nontestexpected);
$p1_prefix = $1; $p1_prefix = $1;
if (!$file && $tree && $p1_prefix ne '' && if (!$file && $tree && $p1_prefix ne '' &&