Re: [PATCH] meson: Re-enable the possibility to run "make check SPEED=slow"

[Paolo Bonzini]

On 18/02/21 18:23, Thomas Huth wrote:
> "make check SPEED=slow" got lost in the conversion of the build
> system to meson - the tests were always running in "quick" mode.
> Fix it by passing the "-m" parameter to the test harness at the
> right spot in scripts/mtest2make.py.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   scripts/mtest2make.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
> index cbbcba100d..ee072c0502 100644
> --- a/scripts/mtest2make.py
> +++ b/scripts/mtest2make.py
> @@ -21,7 +21,7 @@ def __init__(self):
>   SPEED = quick
>   
>   # $1 = environment, $2 = test command, $3 = test name, $4 = dir
> -.test-human-tap = $1 $(if $4,(cd $4 && $2),$2) < /dev/null | ./scripts/tap-driver.pl 
> --test-name="$3" $(if $(V),,--show-failures-only)
> +.test-human-tap = $1 $(if $4,(cd $4 && $2),$2) -m $(SPEED) < /dev/null | 
> ./scripts/tap-driver.pl --test-name="$3" $(if $(V),,--show-failures-only)
>   .test-human-exitcode = $1 $(PYTHON) scripts/test-driver.py $(if $4,-C$4) $(if 
> $(V),--verbose) -- $2 < /dev/null
>   .test-tap-tap = $1 $(if $4,(cd $4 && $2),$2) < /dev/null | sed "s/^[a-z][a-z]* 
> [0-9]*/& $3/" || true
>   .test-tap-exitcode = printf "%s\\n" 1..1 "`$1 $(if $4,(cd $4 && $2),$2) < /dev/null > 
> /dev/null || echo "not "`ok 1 $3"

This is one way to do it, but it will be lost again when switching to 
"meson test".

Go ahead and commit it, I'll figure out something before switching.

Paolo