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

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

[Thomas Huth]

"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"
-- 
2.27.0

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

[no-reply]

Patchew URL: https://patchew.org/QEMU/20210218172313.2217440-1-thuth@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20210218172313.2217440-1-thuth@redhat.com
Subject: [PATCH] meson: Re-enable the possibility to run "make check SPEED=slow"

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]         patchew/20210218172313.2217440-1-thuth@redhat.com -> patchew/20210218172313.2217440-1-thuth@redhat.com
Switched to a new branch 'test'
aa667fc meson: Re-enable the possibility to run "make check SPEED=slow"

=== OUTPUT BEGIN ===
ERROR: line over 90 characters
#27: FILE: scripts/mtest2make.py:24:
+.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)

total: 1 errors, 0 warnings, 8 lines checked

Commit aa667fccba09 (meson: Re-enable the possibility to run "make check SPEED=slow") has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20210218172313.2217440-1-thuth@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

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