Re: [PATCH 2/4] build: make check-block a meson test

[Thomas Huth <thuth@redhat.com>]

On 15/01/2022 23.21, Paolo Bonzini wrote:
> "meson test" can be asked to run tests verbosely; this makes it usable
> also for qemu-iotests's own harness, and it lets "make check-block"
> reuse mtest2make.py's infrastructure to find and build test dependencies.
> 
> Adjust check-block.sh to use the standard exit code that reports a test
> as skipped.  Alternatively, in the future we could make it produce TAP
> output, which is consistent with all other "make check" tests.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   meson.build                    |  6 +++---
>   scripts/mtest2make.py          | 10 +++++++++-
>   tests/Makefile.include         | 16 +++-------------
>   tests/check-block.sh           | 28 +++++++++++++---------------
>   tests/meson.build              |  1 +
>   tests/qemu-iotests/meson.build | 29 +++++++++++++++++++++++++++++
>   6 files changed, 58 insertions(+), 32 deletions(-)
>   create mode 100644 tests/qemu-iotests/meson.build
[...]
> diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
> new file mode 100644
> index 0000000000..94f161d59c
> --- /dev/null
> +++ b/tests/qemu-iotests/meson.build
> @@ -0,0 +1,29 @@
> +if have_tools
> +  qemu_iotests_binaries = [qemu_img, qemu_io, qemu_nbd, qsd]
> +  qemu_iotests_env = {'PYTHON': python.full_path()}
> +  qemu_iotests_formats = {
> +    'raw': 'quick',
> +    'qcow2': 'slow',
> +    'qed': 'thorough',
> +    'vmdk': 'thorough',
> +    'vpc': 'thorough'
> +  }

I think the default behavior for "quick" should be to test with qcow2 - most 
iotests require that format and that's what we're currently using with "make 
check-block" by default... i.e. please swap raw and qcow2 here.

  Thomas