[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 4/6] iotests: Skip "make check-block" if QEMU does not sup
From: |
Max Reitz |
Subject: |
Re: [PATCH v3 4/6] iotests: Skip "make check-block" if QEMU does not support virtio-blk |
Date: |
Wed, 30 Oct 2019 12:21:03 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 |
On 22.10.19 09:21, Thomas Huth wrote:
> The next patch is going to add some python-based tests to the "auto"
> group, and these tests require virtio-blk to work properly. Running
> iotests without virtio-blk likely does not make too much sense anyway,
> so instead of adding a check for the availability of virtio-blk to each
> and every test (which does not sound very appealing), let's rather add
> a check for this at the top level in the check-block.sh script instead
> (so that it is possible to run "make check" without the "check-block"
> part for qemu-system-tricore for example).
>
> Reviewed-by: Max Reitz <address@hidden>
> Signed-off-by: Thomas Huth <address@hidden>
> ---
> tests/check-block.sh | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/tests/check-block.sh b/tests/check-block.sh
> index 679aedec50..e9e2978818 100755
> --- a/tests/check-block.sh
> +++ b/tests/check-block.sh
> @@ -26,10 +26,24 @@ if grep -q "CFLAGS.*-fsanitize" config-host.mak
> 2>/dev/null ; then
> exit 0
> fi
>
> -if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
> +if [ -n "$QEMU_PROG" ]; then
> + qemu_prog="$QEMU_PROG"
> +else
> + for binary in *-softmmu/qemu-system-* ; do
Hm, I know I’ve already given my R-b, but looking at this again – what
if the user builds qemu for multiple targets? Then this will just test
any target, whereas the iotests might test something else, because the
algorithm there is slightly different:
First, check $QEMU_PROG (same as here).
Second, check $build_iotests/qemu. I think we can do this here, because
we know that $build_iotests is $PWD/tests/qemu-iotests (or invoking
./check below wouldn’t work).
Third, and this is actually important, I think, is that we first look
for the qemu that matches the host architecture (uname -m, with an
exception for ppc64). I think we really should do that here, too.
Fourth, look for any qemu, as is done here.
So I think we could do without #2, but it probably doesn’t hurt to check
that, too. I don’t think we should do without #3, though.
Max
signature.asc
Description: OpenPGP digital signature
- [PATCH v3 0/6] Enable more iotests during "make check-block", Thomas Huth, 2019/10/22
- [PATCH v3 2/6] iotests: Test 041 only works on certain systems, Thomas Huth, 2019/10/22
- [PATCH v3 1/6] iotests: remove 'linux' from default supported platforms, Thomas Huth, 2019/10/22
- [PATCH v3 3/6] iotests: Test 183 does not work on macOS and OpenBSD, Thomas Huth, 2019/10/22
- [PATCH v3 4/6] iotests: Skip "make check-block" if QEMU does not support virtio-blk, Thomas Huth, 2019/10/22
- Re: [PATCH v3 4/6] iotests: Skip "make check-block" if QEMU does not support virtio-blk,
Max Reitz <=
- [PATCH v3 5/6] iotests: Enable more tests in the 'auto' group to improve test coverage, Thomas Huth, 2019/10/22
- [PATCH v3 6/6] iotests: Remove 130 from the "auto" group, Thomas Huth, 2019/10/22
- Re: [PATCH v3 0/6] Enable more iotests during "make check-block", Thomas Huth, 2019/10/22
- Re: [PATCH v3 0/6] Enable more iotests during "make check-block", Alex Bennée, 2019/10/22