Re: [PATCH 19/51] tests/qtest: Build test-filter-{mirror, redirector} cases for posix only

[Thomas Huth]

On 24/08/2022 11.39, Bin Meng wrote:

From: Bin Meng <bin.m...@windriver.com>

The test-filter-{mirror,redirector} cases use socketpair() API that
is only available on POSIX and should only be built for POSIX.

Signed-off-by: Bin Meng <bin.m...@windriver.com>
---

  tests/qtest/meson.build | 28 ++++++++++++++++++----------
  1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 9e484e60ba..c97da5a062 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -42,6 +42,7 @@ qtests_cxl = \
  qtests_i386 = \
    (slirp.found() ? ['pxe-test', 'test-netfilter'] : []) +             \
    (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +       
              \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) +    
             \
    (have_tools ? ['ahci-test'] : []) +                                         
              \
    (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : 
[]) +           \
    (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) +    
              \
@@ -95,8 +96,7 @@ qtests_i386 = \
     'vmgenid-test',
     'migration-test',
     'test-x86-cpuid-compat',
-   'numa-test',
-   'test-filter-redirector'
+   'numa-test'
    ]

if dbus_display

@@ -120,29 +120,34 @@ endif
  qtests_x86_64 = qtests_i386

qtests_alpha = ['boot-serial-test'] + \

-  ['test-filter-mirror', 'test-filter-redirector'] + \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +     \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
    (slirp.found() ? ['test-netfilter'] : []) + \
    (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])

qtests_avr = [ 'boot-serial-test' ] qtests_hppa = ['boot-serial-test'] + \

-  ['test-filter-mirror', 'test-filter-redirector'] + \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +     \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
    (slirp.found() ? ['test-netfilter'] : []) + \
    (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])

qtests_m68k = ['boot-serial-test'] + \

-  ['test-filter-mirror', 'test-filter-redirector'] + \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +     \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
    (slirp.found() ? ['test-netfilter'] : [])

qtests_microblaze = ['boot-serial-test'] + \

-  ['test-filter-mirror', 'test-filter-redirector'] + \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +     \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
    (slirp.found() ? ['test-netfilter'] : [])

qtests_microblazeel = qtests_microblaze qtests_mips = \

-  ['test-filter-mirror', 'test-filter-redirector'] + \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +     \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
    (slirp.found() ? ['test-netfilter'] : []) + \
    (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : 
[]) +            \
    (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
@@ -152,7 +157,8 @@ qtests_mips64 = qtests_mips
  qtests_mips64el = qtests_mips

qtests_ppc = \

-  ['test-filter-mirror', 'test-filter-redirector'] + \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +     \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
    (slirp.found() ? ['test-netfilter'] : []) + \
    (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : 
[]) +            \
    (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) +      
               \
@@ -174,13 +180,15 @@ qtests_sh4 = 
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-te
  qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? 
['endianness-test'] : [])

qtests_sparc = ['prom-env-test', 'm48t59-test', 'boot-serial-test'] + \

-  ['test-filter-mirror', 'test-filter-redirector'] + \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +     \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
    (slirp.found() ? ['test-netfilter'] : [])

qtests_sparc64 = \

    (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : 
[]) +            \
    (slirp.found() ? ['test-netfilter'] : []) + \
-  ['test-filter-mirror', 'test-filter-redirector'] + \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +     \
+  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
    ['prom-env-test', 'boot-serial-test']

qtests_npcm7xx = \

It might be easier to introduce a new variable à la:

filter_qtests = \
  (slirp.found() ? ['test-netfilter'] : []) + \
  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
  (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : [])

And then add that to the qtest_ARCH variables instead?

 Thomas