On 06/02/2023 16.04, Fabiano Rosas wrote:
If we build with --without-default-devices, CONFIG_HPET and
CONFIG_PARALLEL are set to N, which makes the respective devices go
missing from acpi tables.
Signed-off-by: Fabiano Rosas <faro...@suse.de>
---
I currently don't see a way of allowing the tests to pass in the
absence of these two configs. As far as I understand, we would need to
have one set of expected table files (tests/data/acpi) for each
combination of machine vs. possible CONFIG that can be toggled.
I think you're right ... maintaining tables for each combination does not
scale. Disabling the test in that case is likely the best we can do here
right now.
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index a930706a43..2829eda2c9 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -78,7 +78,9 @@ qtests_i386 = \
config_all_devices.has_key('CONFIG_Q35') and
\
config_all_devices.has_key('CONFIG_VIRTIO_PCI') and
\
slirp.found() ? ['virtio-net-failover'] : []) +
\
- (unpack_edk2_blobs ? ['bios-tables-test'] : []) +
\
+ (unpack_edk2_blobs and
\
+ config_all_devices.has_key('CONFIG_HPET') and
\
+ config_all_devices.has_key('CONFIG_PARALLEL') ? ['bios-tables-test'] : [])
+ \
qtests_pci +
\
qtests_cxl +
\
['fdc-test',
Reviewed-by: Thomas Huth <th...@redhat.com>
