| Message ID | 20230329124539.822022-1-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for,8.0] tests/qemu-iotests: explicitly invoke 'check' via 'python' | expand |
On 3/29/23 14:45, Daniel P. Berrangé wrote: > 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> > --- > 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: Paolo Bonzini <pbonzini@redhat.com> Paolo
On 29/3/23 14:45, Daniel P. Berrangé wrote: > 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> > --- > tests/qemu-iotests/meson.build | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Daniel P. Berrangé <berrange@redhat.com> writes: > 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> Queued to for-8.0/more-misc-fixes, thanks.
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,
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> --- tests/qemu-iotests/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)