[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/10] checkpatch: enforce process for expected files
From: |
Michael S. Tsirkin |
Subject: |
[PULL 01/10] checkpatch: enforce process for expected files |
Date: |
Tue, 31 Mar 2020 10:57:00 -0400 |
If the process documented in tests/qtest/bios-tables-test.c
is followed, then same patch never touches both expected
files and code. Teach checkpatch to enforce this rule.
Tested-by: Igor Mammedov <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
scripts/checkpatch.pl | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b27e4ff5e9..e658e6546f 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -35,6 +35,8 @@ my $summary_file = 0;
my $root;
my %debug;
my $help = 0;
+my $acpi_testexpected;
+my $acpi_nontestexpected;
sub help {
my ($exitcode) = @_;
@@ -1256,6 +1258,27 @@ sub WARN {
}
}
+# According to tests/qtest/bios-tables-test.c: do not
+# change expected file in the same commit with adding test
+sub checkfilename {
+ my ($name) = @_;
+ if ($name =~ m#^tests/data/acpi/# and
+ # make exception for a shell script that rebuilds the files
+ not $name =~ m#^\.sh$# or
+ $name =~ m#^tests/qtest/bios-tables-test-allowed-diff.h$#) {
+ $acpi_testexpected = $name;
+ } else {
+ $acpi_nontestexpected = $name;
+ }
+ if (defined $acpi_testexpected and defined $acpi_nontestexpected) {
+ ERROR("Do not add expected files together with tests, " .
+ "follow instructions in " .
+ "tests/qtest/bios-tables-test.c: both " .
+ $acpi_testexpected . " and " .
+ $acpi_nontestexpected . " found\n");
+ }
+}
+
sub process {
my $filename = shift;
@@ -1431,9 +1454,11 @@ sub process {
if ($line =~ /^diff --git.*?(\S+)$/) {
$realfile = $1;
$realfile =~ s@^([^/]*)/@@ if (!$file);
+ checkfilename($realfile);
} elsif ($line =~ /^\+\+\+\s+(\S+)/) {
$realfile = $1;
$realfile =~ s@^([^/]*)/@@ if (!$file);
+ checkfilename($realfile);
$p1_prefix = $1;
if (!$file && $tree && $p1_prefix ne '' &&
--
MST
- [PULL 00/10] virtio, pci, pc: bugfixes, checkpatch, maintainers, Michael S. Tsirkin, 2020/03/31
- [PULL 01/10] checkpatch: enforce process for expected files,
Michael S. Tsirkin <=
- [PULL 02/10] MAINTAINERS: Add myself as virtio-balloon co-maintainer, Michael S. Tsirkin, 2020/03/31
- [PULL 03/10] virtio-serial-bus: Plug memory leak on realize() error paths, Michael S. Tsirkin, 2020/03/31
- [PULL 04/10] acpi: pcihp: fix left shift undefined behavior in acpi_pcihp_eject_slot(), Michael S. Tsirkin, 2020/03/31
- [PULL 06/10] virtio-iommu: avoid memleak in the unrealize, Michael S. Tsirkin, 2020/03/31
- [PULL 08/10] fix vhost_user_blk_watch crash, Michael S. Tsirkin, 2020/03/31
- [PULL 07/10] hw/i386/amd_iommu.c: Fix corruption of log events passed to guest, Michael S. Tsirkin, 2020/03/31
- [PULL 10/10] vhost-vsock: fix double close() in the realize() error path, Michael S. Tsirkin, 2020/03/31
- [PULL 05/10] virtio-blk: delete vqs on the error path in realize(), Michael S. Tsirkin, 2020/03/31
- [PULL 09/10] acpi: add acpi=OnOffAuto machine property to x86 and arm virt, Michael S. Tsirkin, 2020/03/31
- Re: [PULL 00/10] virtio, pci, pc: bugfixes, checkpatch, maintainers, Peter Maydell, 2020/03/31