On Fri, Feb 06, 2015 at 04:06:17PM -0500, Max Reitz wrote:
> diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
> index 8e618b5..4e1996c 100644
> --- a/tests/qemu-iotests/common.qemu
> +++ b/tests/qemu-iotests/common.qemu
> @@ -187,13 +187,23 @@ function _launch_qemu()
>
>
> # Silenty kills the QEMU process
> +#
> +# If $wait is set to anything other than the empty string, the process will
> not
> +# be killed but only waited for, and any output will be forwarded to stdout.
> If
> +# $wait is empty, the process will be killed and all output will be
> suppressed.
> function _cleanup_qemu()
> {
> # QEMU_PID[], QEMU_IN[], QEMU_OUT[] all use same indices
> for i in "${!QEMU_OUT[@]}"
> do
> - kill -KILL ${QEMU_PID[$i]} 2>/dev/null
> + if [ -z "${wait}" ]; then
Is the global variable (with a common name) necessary?
function _cleanup_qemu()
{
wait=$1
...
_cleanup_qemu
OR
_cleanup_qemu --wait
pgpz1aMVWIbB_.pgp
Description: PGP signature
