From: Bin Meng <bmeng.cn@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Bin Meng" <bin.meng@windriver.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>
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 [thread overview]
Message-ID: <20220920103159.1865256-13-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20220920103159.1865256-1-bmeng.cn@gmail.com>
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
next prev parent reply other threads:[~2022-09-20 12:27 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 10:31 [PATCH v2 00/39] tests/qtest: Enable running qtest on Windows Bin Meng
2022-09-20 10:31 ` [PATCH v2 01/39] tests: Change to use g_mkdir() Bin Meng
2022-09-22 19:32 ` Marc-André Lureau
2022-09-23 1:09 ` Bin Meng
2022-09-23 18:02 ` Thomas Huth
2022-09-26 8:21 ` Daniel P. Berrangé
2022-09-20 10:31 ` [PATCH v2 02/39] tests/qtest: i440fx-test: Rewrite create_blob_file() to be portable Bin Meng
2022-09-22 19:34 ` Marc-André Lureau
2022-09-20 10:31 ` [PATCH v2 03/39] block: Unify the get_tmp_filename() implementation Bin Meng
2022-09-22 19:38 ` Marc-André Lureau
2022-09-24 8:09 ` Bin Meng
2022-09-20 10:31 ` [PATCH v2 04/39] semihosting/arm-compat-semi: Avoid using hardcoded /tmp Bin Meng
2022-09-23 16:20 ` Alex Bennée
2022-09-20 10:31 ` [PATCH v2 05/39] tcg: " Bin Meng
2022-09-23 16:20 ` Alex Bennée
2022-09-20 10:31 ` [PATCH v2 06/39] util/qemu-sockets: Use g_get_tmp_dir() to get the directory for temporary files Bin Meng
2022-09-20 10:31 ` [PATCH v2 07/39] tests: Avoid using hardcoded /tmp in test cases Bin Meng
2022-09-22 19:46 ` Marc-André Lureau
2022-09-23 4:43 ` Markus Armbruster
2022-09-20 10:31 ` [PATCH v2 08/39] block/vvfat: Unify the mkdir() call Bin Meng
2022-09-22 19:47 ` Marc-André Lureau
2022-09-20 10:31 ` [PATCH v2 09/39] fsdev/virtfs-proxy-helper: Use g_mkdir() Bin Meng
2022-09-20 13:42 ` Christian Schoenebeck
2022-09-20 10:31 ` [PATCH v2 10/39] hw/usb: dev-mtp: " Bin Meng
2022-09-20 11:20 ` Gerd Hoffmann
2022-09-20 10:31 ` [PATCH v2 11/39] tests/qtest: Skip running virtio-net-test cases that require socketpair() for win32 Bin Meng
2022-09-20 10:31 ` Bin Meng [this message]
2022-09-20 10:31 ` [PATCH v2 13/39] tests/qtest: qmp-test: Skip running test_qmp_oob " Bin Meng
2022-09-20 10:31 ` [PATCH v2 14/39] accel/qtest: Implement a portable qtest accelerator Bin Meng
2022-09-20 10:31 ` [PATCH v2 15/39] tests/qtest: libqtest: Adapt global_qtest declaration for win32 Bin Meng
2022-09-20 10:31 ` [PATCH v2 16/39] tests/qtest: Use send/recv for socket communication Bin Meng
2022-09-22 19:52 ` Marc-André Lureau
2022-09-20 10:31 ` [PATCH v2 17/39] tests/qtest: libqtest: Exclude the *_fds APIs for win32 Bin Meng
2022-09-20 10:31 ` [PATCH v2 18/39] tests/qtest: libqtest: Install signal handler via signal() Bin Meng
2022-09-22 19:55 ` Marc-André Lureau
2022-09-23 17:54 ` Thomas Huth
2022-09-20 10:31 ` [PATCH v2 19/39] tests/qtest: Support libqtest to build and run on Windows Bin Meng
2022-09-22 19:59 ` Marc-André Lureau
2022-09-20 10:31 ` [PATCH v2 20/39] tests/qtest: {ahci, ide}-test: Use relative path for temporary files for win32 Bin Meng
2022-09-22 20:02 ` Marc-André Lureau
2022-09-23 20:00 ` John Snow
2022-09-20 10:31 ` [PATCH v2 21/39] tests/qtest: bios-tables-test: Adapt the case " Bin Meng
2022-09-20 10:31 ` [PATCH v2 22/39] tests/qtest: migration-test: Disable IO redirection " Bin Meng
2022-09-22 20:04 ` Marc-André Lureau
2022-09-20 10:31 ` [PATCH v2 23/39] tests/qtest: ide-test: Open file in binary mode Bin Meng
2022-09-20 10:31 ` [PATCH v2 24/39] tests/qtest: virtio-net-failover: Disable migration tests for win32 Bin Meng
2022-09-22 20:05 ` Marc-André Lureau
2022-09-20 10:31 ` [PATCH v2 25/39] chardev/char-file: Add FILE_SHARE_WRITE when openning the file " Bin Meng
2022-09-22 20:09 ` Marc-André Lureau
2022-09-24 8:10 ` Bin Meng
2022-09-25 5:19 ` Bin Meng
2022-09-20 10:31 ` [PATCH v2 26/39] tests/qtest: migration-test: Make sure QEMU process "to" exited after migration is canceled Bin Meng
2022-09-21 16:29 ` Dr. David Alan Gilbert
2022-09-21 16:50 ` Daniel P. Berrangé
2022-09-21 21:54 ` Marc-André Lureau
2022-09-22 3:29 ` Bin Meng
2022-09-20 10:31 ` [PATCH v2 27/39] hw/ppc: spapr: Use qemu_vfree() to free spapr->htab Bin Meng
2022-09-20 10:31 ` [PATCH v2 28/39] hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access failure Bin Meng
2022-09-20 11:17 ` Cédric Le Goater
2022-09-20 15:40 ` Daniel Henrique Barboza
2022-09-21 0:14 ` Bin Meng
2022-09-20 10:31 ` [PATCH v2 29/39] tests/qtest: microbit-test: Fix socket access for win32 Bin Meng
2022-09-20 10:31 ` [PATCH v2 30/39] tests/qtest: libqtest: Replace the call to close a socket with closesocket() Bin Meng
2022-09-20 10:31 ` [PATCH v2 31/39] tests/qtest: libqtest: Correct the timeout unit of blocking receive calls for win32 Bin Meng
2022-09-20 10:31 ` [PATCH v2 32/39] io/channel-watch: Drop a superfluous '#ifdef WIN32' Bin Meng
2022-09-20 10:31 ` [PATCH v2 33/39] io/channel-watch: Drop the unnecessary cast Bin Meng
2022-09-22 20:13 ` Marc-André Lureau
2022-09-20 10:31 ` [PATCH v2 34/39] io/channel-watch: Fix socket watch on Windows Bin Meng
2022-09-20 10:31 ` [PATCH v2 35/39] tests/qtest: migration-test: Skip running some TLS cases for win32 Bin Meng
2022-09-21 16:51 ` Dr. David Alan Gilbert
2022-09-21 17:23 ` Daniel P. Berrangé
2022-09-22 2:47 ` Bin Meng
2022-09-22 10:39 ` Daniel P. Berrangé
2022-09-22 11:54 ` Bin Meng
2022-09-27 15:40 ` Daniel P. Berrangé
2022-09-28 6:03 ` Bin Meng
2022-09-28 7:07 ` Daniel P. Berrangé
2022-09-22 20:16 ` Marc-André Lureau
2022-09-20 10:31 ` [PATCH v2 36/39] .gitlab-ci.d/windows.yml: Increase the timeout to 90 minutes Bin Meng
2022-09-23 16:22 ` Alex Bennée
2022-09-23 17:50 ` Thomas Huth
2022-09-24 1:13 ` Bin Meng
2022-09-20 10:31 ` [PATCH v2 37/39] .gitlab-ci.d/windows.yml: Display meson test logs Bin Meng
2022-09-20 10:31 ` [PATCH v2 38/39] tests/qtest: Enable qtest build on Windows Bin Meng
2022-09-22 20:18 ` Marc-André Lureau
2022-09-24 8:13 ` Bin Meng
2022-09-20 10:31 ` [PATCH v2 39/39] docs/devel: testing: Document writing portable test cases Bin Meng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220920103159.1865256-13-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=bin.meng@windriver.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).