On Thu, Jul 08, 2021 at 10:17:51AM -0400, Stefan Berger wrote: > > On 7/8/21 9:59 AM, Igor Mammedov wrote: > > On Wed, 30 Jun 2021 11:37:19 -0400 > > Stefan Berger <stef...@linux.vnet.ibm.com> wrote: > > > > > Signed-off-by: Stefan Berger <stef...@linux.ibm.com> > > > --- > > > tests/data/acpi/q35/{DSDT.tis => DSDT.tis.tpm2} | Bin > > > tests/data/acpi/q35/{TPM2.tis => TPM2.tis.tpm2} | Bin > > > tests/qtest/bios-tables-test.c | 3 ++- > > > 3 files changed, 2 insertions(+), 1 deletion(-) > > > rename tests/data/acpi/q35/{DSDT.tis => DSDT.tis.tpm2} (100%) > > > rename tests/data/acpi/q35/{TPM2.tis => TPM2.tis.tpm2} (100%) > > it fails checkpatch which falsely detects it as adding new files > > > > ERROR: Do not add expected files together with tests, follow instructions > > in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/TPM2.tis.tpm2 > > and tests/qtest/bios-tables-test.c found > > > > ERROR: Do not add expected files together with tests, follow instructions > > in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/TPM2.tis.tpm2 > > and tests/qtest/bios-tables-test.c found > > > > looks like checkpatch needs to be fixed to handle testcase variant renaming. > > Is this a show stopper for upstreaming it?
It is. The message is wrong (we can teach checkpatch to say do not add or rename) but the point is correct: don't touch binary files and code in the same patch because such binary change patches can't be cherry-picked rebased etc. So pls follow the usual rules: - allow diff - change code - change expected binary - disallow diff -- MST