[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/10] tests/qemu-iotests: explicitly invoke 'check' via 'python'
From: |
Alex Bennée |
Subject: |
[PULL 07/10] tests/qemu-iotests: explicitly invoke 'check' via 'python' |
Date: |
Tue, 4 Apr 2023 15:59:22 +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: <20230403134920.2132362-9-alex.bennee@linaro.org>
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
- [PULL for 8.0 00/10] misc fixes (tests, gdbstub, metadata), Alex Bennée, 2023/04/04
- [PULL 01/10] scripts/coverage: initial coverage comparison script, Alex Bennée, 2023/04/04
- [PULL 03/10] gdbstub: don't report auxv feature unless on Linux, Alex Bennée, 2023/04/04
- [PULL 04/10] MAINTAINERS: add a section for policy documents, Alex Bennée, 2023/04/04
- [PULL 10/10] tests/avocado: Test Xen guest support under KVM, Alex Bennée, 2023/04/04
- [PULL 08/10] tests/vm: use the default system python for NetBSD, Alex Bennée, 2023/04/04
- [PULL 05/10] metadata: add .git-blame-ignore-revs, Alex Bennée, 2023/04/04
- [PULL 02/10] gdbstub: Only build libgdb_user.fa / libgdb_softmmu.fa if necessary, Alex Bennée, 2023/04/04
- [PULL 07/10] tests/qemu-iotests: explicitly invoke 'check' via 'python',
Alex Bennée <=
- [PULL 06/10] Use hexagon toolchain version 16.0.0, Alex Bennée, 2023/04/04
- [PULL 09/10] gitlab: fix typo, Alex Bennée, 2023/04/04
- Re: [PULL for 8.0 00/10] misc fixes (tests, gdbstub, metadata), Peter Maydell, 2023/04/04