From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Fabiano Rosas" <farosas@suse.de>
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 16/18] tests/qtest/meson.build: Run the net filter tests only with default devices
Date: Fri, 12 May 2023 14:40:31 +0200 [thread overview]
Message-ID: <20230512124033.502654-17-thuth@redhat.com> (raw)
In-Reply-To: <20230512124033.502654-1-thuth@redhat.com>
These tests rely on a default NIC to be available. Skip them if we
used the "--without-default-devices" configure option.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/meson.build | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 48cd35b5b2..8fec3103b5 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -35,9 +35,9 @@ 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'] : [])
+ (get_option('default_devices') and slirp.found() ? ['test-netfilter'] : []) + \
+ (get_option('default_devices') and config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
+ (get_option('default_devices') and config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : [])
qtests_i386 = \
(slirp.found() ? ['pxe-test'] : []) + \
@@ -221,9 +221,7 @@ qtests_aarch64 = \
'migration-test']
qtests_s390x = \
- (slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \
- (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
- (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
+ qtests_filter + \
['boot-serial-test',
'drive_del-test',
'device-plug-test',
--
2.31.1
next prev parent reply other threads:[~2023-05-12 12:43 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-12 12:40 [PATCH 00/18] Allow qtests with --without-default-devices (part 1) Thomas Huth
2023-05-12 12:40 ` [PATCH 01/18] hw/i386/Kconfig: ISAPC works fine without VGA_ISA Thomas Huth
2023-05-12 12:40 ` [PATCH 02/18] softmmu/vl.c: Check for the availability of the VGA device before using it Thomas Huth
2023-05-12 12:40 ` [PATCH 03/18] hw: Move the default NIC machine class setting from the x86 to the generic one Thomas Huth
2023-05-12 12:40 ` [PATCH 04/18] softmmu/vl.c: Disable default NIC if it has not been compiled into the binary Thomas Huth
2023-05-12 12:40 ` [PATCH 05/18] hw/ppc: Use MachineClass->default_nic in the ppc machines Thomas Huth
2023-05-12 12:40 ` [PATCH 06/18] hw/s390x: Use MachineClass->default_nic in the s390x machine Thomas Huth
2023-05-12 12:40 ` [PATCH 07/18] hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine Thomas Huth
2023-05-12 12:40 ` [PATCH 08/18] hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file Thomas Huth
2023-05-12 12:40 ` [PATCH 09/18] hw/i386: Ignore the default parallel port if it has not been compiled into QEMU Thomas Huth
2023-05-12 12:40 ` [PATCH 10/18] hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel Thomas Huth
2023-05-12 12:40 ` [PATCH 11/18] tests/qtest/readconfig-test: Check for the availability of USB controllers Thomas Huth
2023-05-12 12:40 ` [PATCH 12/18] tests/qtest/usb-hcd-uhci-test: Skip test if UHCI controller is not available Thomas Huth
2023-05-12 12:40 ` [PATCH 13/18] tests/qtest/cdrom-test: Fix the test to also work without optional devices Thomas Huth
2023-05-12 12:40 ` [PATCH 14/18] tests/qtest/virtio-ccw-test: Remove superfluous tests Thomas Huth
2023-05-12 12:40 ` [PATCH 15/18] tests/qtest: Check for the availability of virtio-ccw devices before using them Thomas Huth
2023-05-12 12:40 ` Thomas Huth [this message]
2023-05-14 20:31 ` [PATCH 16/18] tests/qtest/meson.build: Run the net filter tests only with default devices Paolo Bonzini
2023-05-15 9:46 ` Thomas Huth
2023-05-15 10:42 ` Paolo Bonzini
2023-05-12 12:40 ` [PATCH 17/18] tests/qemu-iotests/172: Run QEMU with -vga none and -nic none Thomas Huth
2023-05-12 12:40 ` [PATCH 18/18] .gitlab-ci.d/buildtest.yml: Run full "make check" with --without-default-devices Thomas Huth
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=20230512124033.502654-17-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=farosas@suse.de \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).