Re: [PATCH 3/7] tests: Add suffix tpm2 or tpm12 to ACPI table files

[Igor Mammedov]

On Wed, 30 Jun 2021 11:37:19 -0400
Stefan Berger <stefanb@linux.vnet.ibm.com> wrote:

> Signed-off-by: Stefan Berger <stefanb@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.


> diff --git a/tests/data/acpi/q35/DSDT.tis b/tests/data/acpi/q35/DSDT.tis.tpm2
> similarity index 100%
> rename from tests/data/acpi/q35/DSDT.tis
> rename to tests/data/acpi/q35/DSDT.tis.tpm2
> diff --git a/tests/data/acpi/q35/TPM2.tis b/tests/data/acpi/q35/TPM2.tis.tpm2
> similarity index 100%
> rename from tests/data/acpi/q35/TPM2.tis
> rename to tests/data/acpi/q35/TPM2.tis.tpm2
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index 93c9d306b5..4ccbe56158 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -1101,7 +1101,8 @@ static void test_acpi_tcg_tpm(const char *machine, 
> const char *tpm_if,
>      TPMTestState test;
>      test_data data;
>      GThread *thread;
> -    char *args, *variant = g_strdup_printf(".%s", tpm_if);
> +    const char *suffix = tpm_version == TPM_VERSION_2_0 ? "tpm2" : "tpm12";
> +    char *args, *variant = g_strdup_printf(".%s.%s", tpm_if, suffix);
>  
>      tpm_tis_base_addr = base;
>