Hi Stefan,
On 7/12/21 5:09 PM, Stefan Berger wrote:
> This series of patches adds test case for TPM 1.2 ACPI tables.
>
> Stefan
>
> v3:
> - Define enum TPMVersion for when CONFIG_TPM is not defined
> affected patches 2 and 6
I think in 11fb99e6f48..e542b71805d we missed an extra patch
for qtests. Probably (untested):
-- >8 --
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index ee7347b7275..eeaa0d7302b 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -60,10 +60,14 @@
(config_all_devices.has_key('CONFIG_USB_UHCI') and
\
config_all_devices.has_key('CONFIG_USB_EHCI') ?
['usb-hcd-ehci-test'] : []) + \
(config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ?
['usb-hcd-xhci-test'] : []) + \
- (config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-test'] :
[]) + \
- (config_all_devices.has_key('CONFIG_TPM_CRB') ?
['tpm-crb-swtpm-test'] : []) + \
- (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-test']
: []) + \
- (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ?
['tpm-tis-swtpm-test'] : []) + \
+ (config_host.has_key('CONFIG_TPM') and \
+ config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-test'] :
[]) + \
+ (config_host.has_key('CONFIG_TPM') and \
+ config_all_devices.has_key('CONFIG_TPM_CRB') ?
['tpm-crb-swtpm-test'] : []) + \
+ (config_host.has_key('CONFIG_TPM') and \
+ config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-test']
: []) + \
+ (config_host.has_key('CONFIG_TPM') and \
+ config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ?
['tpm-tis-swtpm-test'] : []) + \
(config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test']
: []) + \
(config_all_devices.has_key('CONFIG_E1000E_PCI_EXPRESS') ?
['fuzz-e1000e-test'] : []) + \
(config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] :
[]) + \
---
Cc'ing Paolo/Thomas because there surely exists a clever way to do it...
