[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/11] tests/qemu-iotests: explicitly invoke 'check' via 'pyth
From: |
Alex Bennée |
Subject: |
[PATCH v2 08/11] tests/qemu-iotests: explicitly invoke 'check' via 'python' |
Date: |
Mon, 3 Apr 2023 14:49:17 +0100 |
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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230330101141.30199-8-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,
--
2.39.2
- Re: [PATCH v2 05/11] qemu-options: finesse the recommendations around -blockdev, (continued)
- Re: [PATCH v2 05/11] qemu-options: finesse the recommendations around -blockdev, Alex Bennée, 2023/04/04
- Re: [PATCH v2 05/11] qemu-options: finesse the recommendations around -blockdev, Michael Tokarev, 2023/04/04
- Re: [PATCH v2 05/11] qemu-options: finesse the recommendations around -blockdev, Kevin Wolf, 2023/04/04
- Re: [PATCH v2 05/11] qemu-options: finesse the recommendations around -blockdev, Reinoud Zandijk, 2023/04/06
- Re: [PATCH v2 05/11] qemu-options: finesse the recommendations around -blockdev, Kevin Wolf, 2023/04/11
- Re: [PATCH v2 05/11] qemu-options: finesse the recommendations around -blockdev, Alex Bennée, 2023/04/11
[PATCH v2 06/11] metadata: add .git-blame-ignore-revs, Alex Bennée, 2023/04/03
[PATCH v2 07/11] Use hexagon toolchain version 16.0.0, Alex Bennée, 2023/04/03
[PATCH v2 09/11] tests/vm: use the default system python for NetBSD, Alex Bennée, 2023/04/03
[PATCH v2 08/11] tests/qemu-iotests: explicitly invoke 'check' via 'python',
Alex Bennée <=
[PATCH v2 10/11] gitlab: fix typo, Alex Bennée, 2023/04/03
[PATCH v2 11/11] tests/avocado: Test Xen guest support under KVM, Alex Bennée, 2023/04/03