Re: [PATCH 5/6] tests: Do not treat the iotests as separate meson test target anymore

[Thomas Huth]

On 08/02/2022 11.26, Peter Maydell wrote:
> On Tue, 8 Feb 2022 at 10:18, Thomas Huth <thuth@redhat.com> wrote:
> > Now that we add the single iotests directly in meson.build, we do
> > not have to separate the block suite from the other suites anymore.
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> >   meson.build            | 6 +++---
> >   scripts/mtest2make.py  | 4 ----
> >   tests/Makefile.include | 9 +--------
> >   3 files changed, 4 insertions(+), 15 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 5f43355071..b203402ee1 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -3,9 +3,9 @@ project('qemu', ['c'], meson_version: '>=0.58.2',
> >                             'b_staticpic=false', 'stdsplit=false'],
> >           version: files('VERSION'))
> >
> > -add_test_setup('quick', exclude_suites: ['block', 'slow', 'thorough'], 
> > is_default: true)
> > -add_test_setup('slow', exclude_suites: ['block', 'thorough'], env: 
> > ['G_TEST_SLOW=1', 'SPEED=slow'])
> > -add_test_setup('thorough', exclude_suites: ['block'], env: ['G_TEST_SLOW=1', 
> > 'SPEED=thorough'])
> > +add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true)
> > +add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 
> > 'SPEED=slow'])
> > +add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])
> >
> >   not_found = dependency('', required: false)
> >   keyval = import('keyval')
> > diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
> > index 4d542e8aaa..304634b71e 100644
> > --- a/scripts/mtest2make.py
> > +++ b/scripts/mtest2make.py
> > @@ -101,10 +101,6 @@ def emit_suite(name, suite, prefix):
> >   testsuites = defaultdict(Suite)
> >   for test in introspect['tests']:
> >       process_tests(test, targets, testsuites)
> > -# HACK: check-block is a separate target so that it runs with --verbose;
> > -# only write the dependencies
> > -emit_suite_deps('block', testsuites['block'], 'check')
> > -del testsuites['block']
>
> This code being deleted claims to be doing something to ensure that
> the tests get run and output the useful messages on failure.

No, AFAIK that --verbose switch just influences how meson prints the 
progress during the test runs (i.e. either a brief or a slightly more 
verbose output).

> What is the mechanism for this in the new meson setup ?

cat meson-logs/testlog.txt

... I guess we should either dump that to stdout or publish that file as a 
test artifact?

 Thomas