[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/30] tests/qtest: Restrict tpm-tis-devices-{swtpm}-test to CONFI
From: |
Peter Maydell |
Subject: |
[PULL 30/30] tests/qtest: Restrict tpm-tis-devices-{swtpm}-test to CONFIG_TCG |
Date: |
Thu, 16 Feb 2023 17:11:23 +0000 |
From: Fabiano Rosas <farosas@suse.de>
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>
---
tests/qtest/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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',
--
2.34.1
- [PULL 20/30] hw/arm/smmu-common: Fix TTB1 handling, (continued)
- [PULL 20/30] hw/arm/smmu-common: Fix TTB1 handling, Peter Maydell, 2023/02/16
- [PULL 21/30] target/arm: rename handle_semihosting to tcg_handle_semihosting, Peter Maydell, 2023/02/16
- [PULL 22/30] target/arm: wrap psci call with tcg_enabled, Peter Maydell, 2023/02/16
- [PULL 23/30] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled(), Peter Maydell, 2023/02/16
- [PULL 25/30] target/arm: Move cpregs code out of cpu.h, Peter Maydell, 2023/02/16
- [PULL 26/30] tests/avocado: Skip tests that require a missing accelerator, Peter Maydell, 2023/02/16
- [PULL 28/30] target/arm: Use "max" as default cpu for the virt machine with KVM, Peter Maydell, 2023/02/16
- [PULL 24/30] target/arm: Move PC alignment check, Peter Maydell, 2023/02/16
- [PULL 27/30] tests/avocado: Tag TCG tests with accel:tcg, Peter Maydell, 2023/02/16
- [PULL 29/30] tests/qtest: arm-cpu-features: Match tests to required accelerators, Peter Maydell, 2023/02/16
- [PULL 30/30] tests/qtest: Restrict tpm-tis-devices-{swtpm}-test to CONFIG_TCG,
Peter Maydell <=
- Re: [PULL 00/30] target-arm queue, Peter Maydell, 2023/02/20