[PATCH 6/8] tests: Make all tests that use q35 depend on it being compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/qtest/meson.build | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index e910cb32ca..67b3b678d3 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -51,13 +51,16 @@ qtests_i386 = \
   (config_all_devices.has_key('CONFIG_WDT_IB700') ? ['wdt_ib700-test'] : []) + 
             \
   (config_all_devices.has_key('CONFIG_PVPANIC_ISA') ? ['pvpanic-test'] : []) + 
             \
   (config_all_devices.has_key('CONFIG_PVPANIC_PCI') ? ['pvpanic-pci-test'] : 
[]) +          \
-  (config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) +       
             \
+  (config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) +       
            \
   (config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + 
            \
   (config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) +     
             \
-  (config_all_devices.has_key('CONFIG_LPC_ICH9') ? ['lpc-ich9-test'] : []) +   
           \
-  (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) 
+            \
+  (config_all_devices.has_key('CONFIG_LPC_ICH9') and
+   config_all_devices.has_key('CONFIG_Q35') ? ['lpc-ich9-test'] : []) +        
                    \
+  (config_all_devices.has_key('CONFIG_USB_UHCI') and
+   config_all_devices.has_key('CONFIG_Q35') ? ['usb-hcd-uhci-test'] : []) +    
            \
   (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_EHCI') and
+   config_all_devices.has_key('CONFIG_Q35') ? ['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'] : []) 
+            \
@@ -65,10 +68,14 @@ qtests_i386 = \
   (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_MEGASAS_SCSI_PCI') ? 
['fuzz-megasas-test'] : []) +    \
-  (config_all_devices.has_key('CONFIG_LSI_SCSI_PCI') ? 
['fuzz-lsi53c895a-test'] : []) +     \
-  (config_all_devices.has_key('CONFIG_VIRTIO_SCSI') ? 
['fuzz-virtio-scsi-test'] : []) +     \
-  (config_all_devices.has_key('CONFIG_SB16') ? ['fuzz-sb16-test'] : []) +      
             \
+  (config_all_devices.has_key('CONFIG_MEGASAS_SCSI_PCI') and
+   config_all_devices.has_key('CONFIG_Q35') ? ['fuzz-megasas-test'] : []) +    
\
+  (config_all_devices.has_key('CONFIG_LSI_SCSI_PCI') and
+   config_all_devices.has_key('CONFIG_Q35') ? ['fuzz-lsi53c895a-test'] : []) + 
            \
+  (config_all_devices.has_key('CONFIG_VIRTIO_SCSI') and
+   config_all_devices.has_key('CONFIG_Q35') ? ['fuzz-virtio-scsi-test'] : []) 
+                    \
+  (config_all_devices.has_key('CONFIG_SB16') and
+   config_all_devices.has_key('CONFIG_Q35') ? ['fuzz-sb16-test'] : []) +       
            \
   (config_all_devices.has_key('CONFIG_SDHCI_PCI') ? ['fuzz-sdcard-test'] : []) 
+            \
   (config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) +    
             \
   (config_host.has_key('CONFIG_POSIX') and                                     
             \
@@ -77,6 +84,8 @@ qtests_i386 = \
    config_all_devices.has_key('CONFIG_Q35') and                                
             \
    config_all_devices.has_key('CONFIG_VIRTIO_PCI') and                         
             \
    slirp.found() ? ['virtio-net-failover'] : []) +                             
             \
+  (config_all_devices.has_key('CONFIG_Q35') ? ['q35-test'] : []) +             
            \
+  (config_all_devices.has_key('CONFIG_Q35') ? ['tco-test'] : []) +             
            \
   (unpack_edk2_blobs ? ['bios-tables-test'] : []) +                            
             \
   qtests_pci +                                                                 
             \
   qtests_cxl +                                                                 
             \
@@ -89,9 +98,7 @@ qtests_i386 = \
    'fw_cfg-test',
    'device-plug-test',
    'drive_del-test',
-   'tco-test',
    'cpu-plug-test',
-   'q35-test',
    'vmgenid-test',
    'migration-test',
    'test-x86-cpuid-compat',
-- 
2.37.2