On 6/15/20 2:54 PM, Thomas Huth wrote:
> "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.
>
$ git showfix 5da7c35e25a
Fixes: 5da7c35e25 ("bios-tables-test: Add Q35/TPM-TIS test")
Cc: eric.au...@redhat.com
> Signed-off-by: Thomas Huth <th...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Tested-by: Philippe Mathieu-Daudé <phi...@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 53f104a9c5..d170a617d8 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,
> @@ -931,6 +933,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;
> @@ -1094,7 +1098,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);
>
