[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/18] tests/qtest/meson.build: Run the net filter tests only wit
|
From: |
Thomas Huth |
|
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 |
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
- [PATCH 03/18] hw: Move the default NIC machine class setting from the x86 to the generic one, (continued)
- [PATCH 03/18] hw: Move the default NIC machine class setting from the x86 to the generic one, Thomas Huth, 2023/05/12
- [PATCH 08/18] hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file, Thomas Huth, 2023/05/12
- [PATCH 06/18] hw/s390x: Use MachineClass->default_nic in the s390x machine, Thomas Huth, 2023/05/12
- [PATCH 09/18] hw/i386: Ignore the default parallel port if it has not been compiled into QEMU, Thomas Huth, 2023/05/12
- [PATCH 10/18] hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel, Thomas Huth, 2023/05/12
- [PATCH 11/18] tests/qtest/readconfig-test: Check for the availability of USB controllers, Thomas Huth, 2023/05/12
- [PATCH 12/18] tests/qtest/usb-hcd-uhci-test: Skip test if UHCI controller is not available, Thomas Huth, 2023/05/12
- [PATCH 15/18] tests/qtest: Check for the availability of virtio-ccw devices before using them, Thomas Huth, 2023/05/12
- [PATCH 13/18] tests/qtest/cdrom-test: Fix the test to also work without optional devices, Thomas Huth, 2023/05/12
- [PATCH 14/18] tests/qtest/virtio-ccw-test: Remove superfluous tests, Thomas Huth, 2023/05/12
- [PATCH 16/18] tests/qtest/meson.build: Run the net filter tests only with default devices,
Thomas Huth <=
- [PATCH 18/18] .gitlab-ci.d/buildtest.yml: Run full "make check" with --without-default-devices, Thomas Huth, 2023/05/12
- [PATCH 17/18] tests/qemu-iotests/172: Run QEMU with -vga none and -nic none, Thomas Huth, 2023/05/12