diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2023-04-03 14:49:17 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2023-04-04 15:56:44 +0100 |
| commit | 90834f5de6a23011c3c3e45db851914b52604262 (patch) | |
| tree | b5dc352d3aa3325eb92f53e3802c79e9684cc4c8 | |
| parent | 6e3be02291acec5d8edc89728fff455014d58a32 (diff) | |
| download | qemu-90834f5de6a23011c3c3e45db851914b52604262.zip qemu-90834f5de6a23011c3c3e45db851914b52604262.tar.gz qemu-90834f5de6a23011c3c3e45db851914b52604262.tar.bz2 | |
tests/qemu-iotests: explicitly invoke 'check' via 'python'
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>
| -rw-r--r-- | tests/qemu-iotests/meson.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index a162f68..9735071 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, |