[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/19] tests/qtest/bios-tables: Only run the TPM test with CONFIG_
From: |
Michael S. Tsirkin |
Subject: |
[PULL 18/19] tests/qtest/bios-tables: Only run the TPM test with CONFIG_TPM enabled |
Date: |
Wed, 24 Jun 2020 19:07:15 -0400 |
From: Thomas Huth <thuth@redhat.com>
"make check-qtest" currently fails if configure has been run with
"--disable-tpm" - the TPM-related tests can only work if the TPM is
enabled in the build. So let's use the CONFIG_TPM switch to disable
the test if TPM is not available.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200615125402.12898-1-thuth@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Fixes: 5da7c35e25 ("bios-tables-test: Add Q35/TPM-TIS test")
Cc: eric.auger@redhat.com
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/qtest/bios-tables-test.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index c315156858..3bd57b830d 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -877,6 +877,8 @@ static void test_acpi_piix4_tcg_numamem(void)
free_test_data(&data);
}
+#ifdef CONFIG_TPM
+
uint64_t tpm_tis_base_addr;
static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
@@ -935,6 +937,8 @@ static void test_acpi_q35_tcg_tpm_tis(void)
test_acpi_tcg_tpm("q35", "tis", 0xFED40000);
}
+#endif /* CONFIG_TPM */
+
static void test_acpi_tcg_dimm_pxm(const char *machine)
{
test_data data;
@@ -1098,7 +1102,9 @@ int main(int argc, char *argv[])
return ret;
}
+#ifdef CONFIG_TPM
qtest_add_func("acpi/q35/tpm-tis", test_acpi_q35_tcg_tpm_tis);
+#endif
qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
qtest_add_func("acpi/q35", test_acpi_q35_tcg);
--
MST
- [PULL 08/19] acpi: simplify build_isa_devices_aml(), (continued)
- [PULL 08/19] acpi: simplify build_isa_devices_aml(), Michael S. Tsirkin, 2020/06/24
- [PULL 09/19] acpi: drop serial/parallel enable bits from dsdt, Michael S. Tsirkin, 2020/06/24
- [PULL 10/19] acpi: drop build_piix4_pm(), Michael S. Tsirkin, 2020/06/24
- [PULL 11/19] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion., Michael S. Tsirkin, 2020/06/24
- [PULL 12/19] tests/acpi: update expected data files, Michael S. Tsirkin, 2020/06/24
- [PULL 14/19] arm/acpi: Add the TPM2.0 device under the DSDT, Michael S. Tsirkin, 2020/06/24
- [PULL 13/19] acpi: Some build_tpm2() code reshape, Michael S. Tsirkin, 2020/06/24
- [PULL 16/19] Stop vhost-user sending uninitialized mmap_offsets, Michael S. Tsirkin, 2020/06/24
- [PULL 15/19] docs/specs/tpm: ACPI boot now supported for TPM/ARM, Michael S. Tsirkin, 2020/06/24
- [PULL 17/19] Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge, Michael S. Tsirkin, 2020/06/24
- [PULL 18/19] tests/qtest/bios-tables: Only run the TPM test with CONFIG_TPM enabled,
Michael S. Tsirkin <=
- [PULL 19/19] tests: disassemble-asm.sh: generate AML in readable format, Michael S. Tsirkin, 2020/06/24
- Re: [PULL 00/19] virtio,acpi,pci: fixes, cleanups, tools., Thomas Huth, 2020/06/25
- Re: [PULL 00/19] virtio,acpi,pci: fixes, cleanups, tools., Peter Maydell, 2020/06/25