summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Reitz2020-10-27 20:05:52 +0100
committerKevin Wolf2020-12-11 17:52:40 +0100
commitb4a373bc1c7c491a75d07b962841e092bbc77f64 (patch)
treeb06d07daea7847bc3eb5f75973bd5181e50fb97c
parentiotests: Derive image names from $TEST_IMG (diff)
downloadqemu-b4a373bc1c7c491a75d07b962841e092bbc77f64.tar.gz
qemu-b4a373bc1c7c491a75d07b962841e092bbc77f64.tar.xz
qemu-b4a373bc1c7c491a75d07b962841e092bbc77f64.zip
iotests/091: Use _cleanup_qemu instad of "wait"
If the test environment has some other child processes running (like a storage daemon that provides a FUSE export), then "wait" will never finish. Use wait=yes _cleanup_qemu instead. (We need to discard the output so there is no change to the reference output.) Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20201027190600.192171-13-mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rwxr-xr-xtests/qemu-iotests/0913
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index 68fbfd777b..8a4ce5b7e2 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -96,7 +96,8 @@ _send_qemu_cmd $h2 'qemu-io disk flush' "(qemu)"
_send_qemu_cmd $h2 'quit' ""
_send_qemu_cmd $h1 'quit' ""
-wait
+wait=yes _cleanup_qemu >/dev/null
+
echo "Check image pattern"
${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io