[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [Qemu-devel] [PATCH v5 02/13] iotests: Make redirecting
From: |
Fam Zheng |
Subject: |
Re: [Qemu-block] [Qemu-devel] [PATCH v5 02/13] iotests: Make redirecting qemu's stderr optional |
Date: |
Wed, 4 Mar 2015 14:19:58 +0800 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
On Tue, 03/03 15:13, Max Reitz wrote:
> Redirecting qemu's stderr to stdout makes working with the stderr output
> difficult due to the other file descriptor magic performed in
> _launch_qemu ("ambiguous redirect").
>
> Add an option which specifies whether stderr should be redirected to
> stdout or not (allowing for other modes to be added in the future).
>
> Signed-off-by: Max Reitz <address@hidden>
> ---
> tests/qemu-iotests/common.qemu | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
> index 4e1996c..1b5a554 100644
> --- a/tests/qemu-iotests/common.qemu
> +++ b/tests/qemu-iotests/common.qemu
> @@ -131,6 +131,8 @@ function _send_qemu_cmd()
> # $qemu_comm_method: set this variable to 'monitor' (case insensitive)
> # to use the QEMU HMP monitor for communication.
> # Otherwise, the default of QMP is used.
> +# $keep_stderr: Set this variable to 'y' to keep QEMU's stderr output on
> stderr.
> +# If this variable is empty, stderr will be redirected to
> stdout.
> # Returns:
> # $QEMU_HANDLE: set to a handle value to communicate with this QEMU instance.
> #
> @@ -153,10 +155,18 @@ function _launch_qemu()
> mkfifo "${fifo_out}"
> mkfifo "${fifo_in}"
>
> - "${QEMU}" -nographic -serial none ${comm} -machine accel=qtest
> "address@hidden" \
> + if [ -z "$keep_stderr" ]; then
> + "${QEMU}" -nographic -serial none ${comm} -machine accel=qtest
> "address@hidden" \
>
> >"${fifo_out}" \
> 2>&1 \
>
> <"${fifo_in}" &
> + elif [ "$keep_stderr" = "y" ]; then
> + "${QEMU}" -nographic -serial none ${comm} -machine accel=qtest
> "address@hidden" \
> +
> >"${fifo_out}" \
> +
> <"${fifo_in}" &
> + else
> + exit 1
> + fi
> QEMU_PID[${_QEMU_HANDLE}]=$!
>
> if [[ "${BASH_VERSINFO[0]}" -ge "5" ||
> --
> 2.1.0
>
>
There is some duplication in both branches but I can live with that:
Reviewed-by: Fam Zheng <address@hidden>
- [Qemu-block] [PATCH v5 00/13] block: Rework bdrv_close_all(), Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 02/13] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2015/03/03
- Re: [Qemu-block] [Qemu-devel] [PATCH v5 02/13] iotests: Make redirecting qemu's stderr optional,
Fam Zheng <=
- [Qemu-block] [PATCH v5 06/13] block: Use blk_remove_bs() in blk_delete(), Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 07/13] blockdev: Use blk_remove_bs() in do_drive_del(), Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 01/13] iotests: Move _filter_nbd into common.filter, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 03/13] iotests: Add test for eject under NBD server, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 05/13] block: Move BDS close notifiers into BB, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 08/13] block: Make bdrv_close() static, Max Reitz, 2015/03/03