Skip to content

Commit

Permalink
tests/qemu-iotests: explicitly invoke 'check' via 'python'
Browse files Browse the repository at this point in the history
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 51ab5f8
  Author: Daniel P. Berrangé <[email protected]>
  Date:   Wed Mar 15 17:43:23 2023 +0000

    iotests: register each I/O test separately with meson

Signed-off-by: Daniel P. Berrangé <[email protected]>
Reviewed-by: Paolo Bonzini <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Alex Bennée <[email protected]>
Reviewed-by: Thomas Huth <[email protected]>
Message-Id: <[email protected]>
  • Loading branch information
berrange authored and stsquad committed Apr 4, 2023
1 parent 6e3be02 commit 90834f5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions tests/qemu-iotests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 90834f5

Please sign in to comment.