diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-03 17:04:25 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 06:30:40 -0400 |
| commit | 64ed6f92ffebb419ba71ef61e7bdb5f165c5043a (patch) | |
| tree | 1b7a2d3f7448e8e5c54c03d5a258cc3759dfe12d /tests/qemu-iotests | |
| parent | f556b4a10d3ccd6cad01f704e4ccb2252520d61e (diff) | |
| download | qemu-64ed6f92ffebb419ba71ef61e7bdb5f165c5043a.zip qemu-64ed6f92ffebb419ba71ef61e7bdb5f165c5043a.tar.gz qemu-64ed6f92ffebb419ba71ef61e7bdb5f165c5043a.tar.bz2 | |
meson: link emulators without Makefile.target
The binaries move to the root directory, e.g. qemu-system-i386 or
qemu-arm. This requires changes to qtests, CI, etc.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rwxr-xr-x | tests/qemu-iotests/check | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 0657f72..3ab859a 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -577,11 +577,11 @@ if [ -z "$QEMU_PROG" ] then if [ -x "$build_iotests/qemu" ]; then export QEMU_PROG="$build_iotests/qemu" - elif [ -x "$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}" ]; then - export QEMU_PROG="$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}" + elif [ -x "$build_root/qemu-system-${qemu_arch}" ]; then + export QEMU_PROG="$build_root/qemu-system-${qemu_arch}" else pushd "$build_root" > /dev/null - for binary in *-softmmu/qemu-system-* + for binary in qemu-system-* do if [ -x "$binary" ] then |