On Thu, Aug 25, 2022 at 8:04 PM Thomas Huth <th...@redhat.com> wrote: > > On 24/08/2022 11.40, Bin Meng wrote: > > From: Bin Meng <bin.m...@windriver.com> > > > > When QEMU is configured with '--without-default-devices', we should > > not build and run iotests and qtest because devices used by these > > test cases are not built in. > > > > Signed-off-by: Bin Meng <bin.m...@windriver.com> > > --- > > > > tests/qemu-iotests/meson.build | 5 +++++ > > tests/qtest/meson.build | 5 +++++ > > 2 files changed, 10 insertions(+) > > > > diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build > > index 323a4acb6a..38d9a874d2 100644 > > --- a/tests/qemu-iotests/meson.build > > +++ b/tests/qemu-iotests/meson.build > > @@ -2,6 +2,11 @@ if not have_tools or targetos == 'windows' or > > get_option('gprof') > > subdir_done() > > endif > > > > +# Skip iotests if configured without a default selection of devices > > +if not get_option('default_devices') > > + subdir_done() > > +endif > > + > > foreach cflag: config_host['QEMU_CFLAGS'].split() > > if cflag.startswith('-fsanitize') and \ > > not cflag.contains('safe-stack') and not cflag.contains('cfi-icall') > > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > > index c97da5a062..0291b3966c 100644 > > --- a/tests/qtest/meson.build > > +++ b/tests/qtest/meson.build > > @@ -4,6 +4,11 @@ if not config_host.has_key('CONFIG_POSIX') > > subdir_done() > > endif > > > > +# Skip QTests if configured without a default selection of devices > > +if not get_option('default_devices') > > + subdir_done() > > +endif > > + > > slow_qtests = { > > 'ahci-test' : 60, > > 'bios-tables-test' : 120, > > That's a very big hammer already ... I'd prefer if we could work on the > tests instead to adapt for the availability of devices instead (we've done > quite a lot of work in this area in the past already, but apparently still > not enough yet ...)
Adapting tests for the availability of devices is a large scope. I may not have time to work on this. I will have to drop this patch in v2, and adjust the patches in the series to keep bisectability then. Regards, Bin