From: Fabiano Rosas Date: Mon, 13 Feb 2023 20:29:23 +0000 (-0300) Subject: tests/qtest: Restrict tpm-tis-devices-{swtpm}-test to CONFIG_TCG X-Git-Tag: v8.0.0-rc0~57^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=caf01d6a435d9f4a95aeae2f9fc6cb8b889b1fb8;p=thirdparty%2Fqemu.git tests/qtest: Restrict tpm-tis-devices-{swtpm}-test to CONFIG_TCG These tests set -accel tcg, so restrict them to when TCG is present. Signed-off-by: Fabiano Rosas Acked-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell --- diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 222e1892fb5..29a4efb4c24 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -208,8 +208,8 @@ qtests_arm = \ # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional qtests_aarch64 = \ (cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \ - (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-test'] : []) + \ - (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \ + (config_all.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \ + ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \ (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \ ['arm-cpu-features',