qemu-block
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 07/11] tests/qemu-iotests: explicitly invoke 'check' via 'pyt


From: Thomas Huth
Subject: Re: [PATCH 07/11] tests/qemu-iotests: explicitly invoke 'check' via 'python'
Date: Thu, 30 Mar 2023 13:27:34 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0

On 30/03/2023 12.11, Alex Bennée wrote:
From: Daniel P. Berrangé <berrange@redhat.com>

The 'check' script will use "#!/usr/bin/env python3" by default
to locate python, but this doesn't work in distros which lack a
bare 'python3' binary like NetBSD.

We need to explicitly invoke 'check' by referring to the 'python'
variable in meson, which resolves to the detected python binary
that QEMU intends to use.

This fixes a regression introduced by

   commit 51ab5f8bd795d8980351f8531e54995ff9e6d163
   Author: Daniel P. Berrangé <berrange@redhat.com>
   Date:   Wed Mar 15 17:43:23 2023 +0000

     iotests: register each I/O test separately with meson

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230329124539.822022-1-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
  tests/qemu-iotests/meson.build | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
index a162f683ef..9735071a29 100644
--- a/tests/qemu-iotests/meson.build
+++ b/tests/qemu-iotests/meson.build
@@ -47,19 +47,20 @@ foreach format, speed: qemu_iotests_formats
    endif
rc = run_command(
-      [qemu_iotests_check_cmd] + args + ['-n'],
+      [python, qemu_iotests_check_cmd] + args + ['-n'],
        check: true,
    )
foreach item: rc.stdout().strip().split()
-      args = ['-tap', '-' + format, item,
+      args = [qemu_iotests_check_cmd,
+              '-tap', '-' + format, item,
                '--source-dir', meson.current_source_dir(),
                '--build-dir', meson.current_build_dir()]
        # Some individual tests take as long as 45 seconds
        # Bump the timeout to 3 minutes for some headroom
        # on slow machines to minimize spurious failures
        test('io-' + format + '-' + item,
-           qemu_iotests_check_cmd,
+           python,
             args: args,
             depends: qemu_iotests_binaries,
             env: qemu_iotests_env,

Reviewed-by: Thomas Huth <thuth@redhat.com>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]