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

[Thomas Huth]

On 02/09/2022 19.34, Juan Quintela wrote:
Signed-off-by: Juan Quintela <quint...@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'] : []) +       
            \

White space damage?

    (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'] : []) +    
            \

Are you sure about the UHCI test? I did not spot any "q35" in 
tests/qtest/usb-hcd-uhci-test.c ...?

 Thomas