summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorFabiano Rosas <farosas@suse.de>2023-02-13 17:29:23 -0300
committerPeter Maydell <peter.maydell@linaro.org>2023-02-16 16:28:53 +0000
commitcaf01d6a435d9f4a95aeae2f9fc6cb8b889b1fb8 (patch)
tree943370cd1d17d3e0897cee408fe7576762ba365d
parent500a0accb5319df02c0385f877a37f7e2a2a0bb3 (diff)
downloadfocaccia-qemu-caf01d6a435d9f4a95aeae2f9fc6cb8b889b1fb8.tar.gz
focaccia-qemu-caf01d6a435d9f4a95aeae2f9fc6cb8b889b1fb8.zip
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 <farosas@suse.de>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--tests/qtest/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 222e1892fb..29a4efb4c2 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',