You probably have never thought much about scripts/mtest2make.py, and in
fact it has seen only a hendful of commits in the last few years.
The idea is pretty simple: gather the list of testsuites and their
dependencies, and turn a "make check-*" invocation into calling "ninja"
first and "meson test" second.  On top of that, it magically turns
SPEED=thorough into invoking up to three suites named XYZ, XYZ-slow
and XYZ-thorough.

But even this incospicuous script can harbor a bug, or rather an "I
didn't really think too much about it" situation.  Dependencies are added
to suite XYZ independent of the speed that is used in the meson.build
file: add a dependency to a func-thorough test and "make check-func"
will build it at any requested speed.

Fixing this is a one line change with some cleanup performed on the
front, and that cleanup is patch 1.  This (at least to me) also makes
the generated Makefile.mtest file a little bit easier to read, which is
nice to have.

Paolo

v1->v2: support "make check-SUITE" where SUITE includes a speed

Paolo Bonzini (3):
  mtest2make: cleanup mtest-suites variables
  mtest2make: add dependencies to the "speed-qualified" suite
  mtest2make: do not repeat the same speed over and over

 Makefile              |  4 +++-
 scripts/mtest2make.py | 43 ++++++++++++++++++-------------------------
 2 files changed, 21 insertions(+), 26 deletions(-)

-- 
2.51.1

Paolo Bonzini <pbonzini@redhat.com> writes:

> You probably have never thought much about scripts/mtest2make.py, and in
> fact it has seen only a hendful of commits in the last few years.
> The idea is pretty simple: gather the list of testsuites and their
> dependencies, and turn a "make check-*" invocation into calling "ninja"
> first and "meson test" second.  On top of that, it magically turns
> SPEED=thorough into invoking up to three suites named XYZ, XYZ-slow
> and XYZ-thorough.
>
> But even this incospicuous script can harbor a bug, or rather an "I
> didn't really think too much about it" situation.  Dependencies are added
> to suite XYZ independent of the speed that is used in the meson.build
> file: add a dependency to a func-thorough test and "make check-func"
> will build it at any requested speed.
>
> Fixing this is a one line change with some cleanup performed on the
> front, and that cleanup is patch 1.  This (at least to me) also makes
> the generated Makefile.mtest file a little bit easier to read, which is
> nice to have.

Have a:

Tested-by: Alex Bennée <alex.bennee@linaro.org>

for the series.

>
> Paolo
>
> v1->v2: support "make check-SUITE" where SUITE includes a speed
>
> Paolo Bonzini (3):
>   mtest2make: cleanup mtest-suites variables
>   mtest2make: add dependencies to the "speed-qualified" suite
>   mtest2make: do not repeat the same speed over and over
>
>  Makefile              |  4 +++-
>  scripts/mtest2make.py | 43 ++++++++++++++++++-------------------------
>  2 files changed, 21 insertions(+), 26 deletions(-)

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro