Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
tests/qtest/meson.build: Run the net filter tests only with default d…
…evices

These tests rely on a default NIC to be available. Skip them if we
used the "--without-default-devices" configure option.

Message-Id: <20230512124033.502654-17-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
huth committed May 22, 2023
1 parent 65331bf commit 973d97f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tests/qtest/meson.build
Expand Up @@ -34,10 +34,12 @@ qtests_pci = \
qtests_cxl = \
(config_all_devices.has_key('CONFIG_CXL') ? ['cxl-test'] : [])

# FIXME: Get rid of get_option('default_devices') here and check
# for the availability of the default NICs in the tests
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'] : []) + \
Expand Down Expand Up @@ -221,9 +223,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',
Expand Down

0 comments on commit 973d97f

Please sign in to comment.