[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 12/39] tests/qtest: Build test-filter-{mirror, redirector} cas
From: |
Bin Meng |
Subject: |
[PATCH v2 12/39] tests/qtest: Build test-filter-{mirror, redirector} cases for posix only |
Date: |
Tue, 20 Sep 2022 18:31:32 +0800 |
From: Bin Meng <bin.meng@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.meng@windriver.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Changes in v2:
- Introduce a new variable qtests_filter and add that to the
qtests_ARCH variables
tests/qtest/meson.build | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index e910cb32ca..455f1bbb7e 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -39,9 +39,14 @@ qtests_pci = \
qtests_cxl = \
(config_all_devices.has_key('CONFIG_CXL') ? ['cxl-test'] : [])
+qtests_filter = \
+ (slirp.found() ? ['test-netfilter'] : []) + \
+ (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
+ (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : [])
+
qtests_i386 = \
- (slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \
- (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) +
\
+ (slirp.found() ? ['pxe-test'] : []) + \
+ qtests_filter + \
(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 +100,7 @@ qtests_i386 = \
'vmgenid-test',
'migration-test',
'test-x86-cpuid-compat',
- 'numa-test',
- 'test-filter-redirector'
+ 'numa-test'
]
if dbus_display
@@ -120,30 +124,25 @@ endif
qtests_x86_64 = qtests_i386
qtests_alpha = ['boot-serial-test'] + \
- ['test-filter-mirror', 'test-filter-redirector'] + \
- (slirp.found() ? ['test-netfilter'] : []) + \
+ qtests_filter + \
(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'] + \
- (slirp.found() ? ['test-netfilter'] : []) + \
+ qtests_filter + \
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
qtests_m68k = ['boot-serial-test'] + \
- ['test-filter-mirror', 'test-filter-redirector'] + \
- (slirp.found() ? ['test-netfilter'] : [])
+ qtests_filter
qtests_microblaze = ['boot-serial-test'] + \
- ['test-filter-mirror', 'test-filter-redirector'] + \
- (slirp.found() ? ['test-netfilter'] : [])
+ qtests_filter
qtests_microblazeel = qtests_microblaze
qtests_mips = \
- ['test-filter-mirror', 'test-filter-redirector'] + \
- (slirp.found() ? ['test-netfilter'] : []) + \
+ qtests_filter + \
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] :
[]) + \
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
@@ -152,8 +151,7 @@ qtests_mips64 = qtests_mips
qtests_mips64el = qtests_mips
qtests_ppc = \
- ['test-filter-mirror', 'test-filter-redirector'] + \
- (slirp.found() ? ['test-netfilter'] : []) + \
+ qtests_filter + \
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] :
[]) + \
(config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) +
\
(config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) +
\
@@ -174,13 +172,11 @@ 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'] + \
- (slirp.found() ? ['test-netfilter'] : [])
+ qtests_filter
qtests_sparc64 = \
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] :
[]) + \
- (slirp.found() ? ['test-netfilter'] : []) + \
- ['test-filter-mirror', 'test-filter-redirector'] + \
+ qtests_filter + \
['prom-env-test', 'boot-serial-test']
qtests_npcm7xx = \
--
2.34.1
- Re: [PATCH v2 02/39] tests/qtest: i440fx-test: Rewrite create_blob_file() to be portable, (continued)
- [PATCH v2 10/39] hw/usb: dev-mtp: Use g_mkdir(), Bin Meng, 2022/09/20
- [PATCH v2 06/39] util/qemu-sockets: Use g_get_tmp_dir() to get the directory for temporary files, Bin Meng, 2022/09/20
- [PATCH v2 07/39] tests: Avoid using hardcoded /tmp in test cases, Bin Meng, 2022/09/20
- [PATCH v2 09/39] fsdev/virtfs-proxy-helper: Use g_mkdir(), Bin Meng, 2022/09/20
- [PATCH v2 11/39] tests/qtest: Skip running virtio-net-test cases that require socketpair() for win32, Bin Meng, 2022/09/20
- [PATCH v2 12/39] tests/qtest: Build test-filter-{mirror, redirector} cases for posix only,
Bin Meng <=
- [PATCH v2 13/39] tests/qtest: qmp-test: Skip running test_qmp_oob for win32, Bin Meng, 2022/09/20
- [PATCH v2 15/39] tests/qtest: libqtest: Adapt global_qtest declaration for win32, Bin Meng, 2022/09/20
- [PATCH v2 16/39] tests/qtest: Use send/recv for socket communication, Bin Meng, 2022/09/20
- [PATCH v2 14/39] accel/qtest: Implement a portable qtest accelerator, Bin Meng, 2022/09/20
- [PATCH v2 18/39] tests/qtest: libqtest: Install signal handler via signal(), Bin Meng, 2022/09/20
- [PATCH v2 20/39] tests/qtest: {ahci, ide}-test: Use relative path for temporary files for win32, Bin Meng, 2022/09/20