From ecaf8c8a6fdd2153f1652d1598c4e344cc961e3b Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 9 Jun 2017 13:32:48 +0200 Subject: qemu-iotests: Allow starting new qemu after cleanup After _cleanup_qemu(), test cases should be able to start the next qemu process and call _cleanup_qemu() for that one as well. For this to work cleanly, we need to improve the cleanup so that the second invocation doesn't try to kill the qemu instances from the first invocation a second time (which would result in error messages). Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- tests/qemu-iotests/common.qemu | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests') diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu index 7a78a00999..76ef298d3f 100644 --- a/tests/qemu-iotests/common.qemu +++ b/tests/qemu-iotests/common.qemu @@ -222,5 +222,8 @@ function _cleanup_qemu() rm -f "${QEMU_FIFO_IN}_${i}" "${QEMU_FIFO_OUT}_${i}" eval "exec ${QEMU_IN[$i]}<&-" # close file descriptors eval "exec ${QEMU_OUT[$i]}<&-" + + unset QEMU_IN[$i] + unset QEMU_OUT[$i] done } -- cgit v1.2.3