[PATCH] tests/qtest/meson.build: Add more CONFIG switches checks for the x86 tests

[Thomas Huth]

When configuring QEMU with "--without-default-devices", currently a lot
of the x86 qtests are failing since they silently assume that a certain
device or the i440fx pc machine is available. Add more checks for CONFIG
switches here to not run those tests in case the corresponding device is
not available.

Signed-off-by: Thomas Huth <th...@redhat.com>
---
 tests/qtest/meson.build | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 486974cad7..587e1dc47e 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -49,9 +49,15 @@ qtests_filter = \
 qtests_i386 = \
   (slirp.found() ? ['pxe-test'] : []) + \
   qtests_filter + \
-  (have_tools ? ['ahci-test'] : []) +                                          
             \
+  (config_all_devices.has_key('CONFIG_ACPI_VMGENID') ? ['vmgenid-test'] : []) 
+             \
+  (config_all_devices.has_key('CONFIG_AHCI_ICH9') and have_tools ? 
['ahci-test'] : []) +    \
+  (config_all_devices.has_key('CONFIG_AHCI_ICH9') ? ['tco-test'] : []) +       
             \
   (config_all_devices.has_key('CONFIG_FDC_ISA') ? ['fdc-test'] : []) +         
             \
+  (config_all_devices.has_key('CONFIG_I440FX') ? ['fw_cfg-test'] : []) +       
             \
   (config_all_devices.has_key('CONFIG_I440FX') ? ['i440fx-test'] : []) +       
             \
+  (config_all_devices.has_key('CONFIG_I440FX') ? ['ide-test'] : []) +          
             \
+  (config_all_devices.has_key('CONFIG_I440FX') ? ['numa-test'] : []) +         
             \
+  (config_all_devices.has_key('CONFIG_I440FX') ? ['test-x86-cpuid-compat'] : 
[]) +          \
   (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : 
[]) +           \
   (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) +     
             \
   (config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] : []) 
+            \
@@ -96,21 +102,15 @@ qtests_i386 = \
   qtests_pci +                                                                 
             \
   qtests_cxl +                                                                 
             \
   [
-   'ide-test',
    'hd-geo-test',
    'boot-order-test',
-   'fw_cfg-test',
    'device-plug-test',
    'drive_del-test',
-   'tco-test',
    'cpu-plug-test',
-   'vmgenid-test',
    'migration-test',
-   'test-x86-cpuid-compat',
-   'numa-test'
   ]
 
-if dbus_display
+if dbus_display and config_all_devices.has_key('CONFIG_VGA')
   qtests_i386 += ['dbus-display-test']
 endif
 
-- 
2.46.0