[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] qemu-iotests: Allow QMP pretty printing in comm
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 3/5] qemu-iotests: Allow QMP pretty printing in common.qemu |
Date: |
Mon, 25 Sep 2017 14:28:06 +0200 |
QMP responses to certain commands can become quite long, which doesn't
only make reading them hard, but also means that the maximum line length
in patch emails can be exceeded. Allow tests to switch to QMP pretty
printing, which results in more, but shorter lines.
We also need to make sure to keep indentation in the response for this
to work as expected.
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/common.qemu | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
index 7645f1dc72..92739a1eac 100644
--- a/tests/qemu-iotests/common.qemu
+++ b/tests/qemu-iotests/common.qemu
@@ -55,13 +55,13 @@ function _timed_wait_for()
shift
QEMU_STATUS[$h]=0
- while read -t ${QEMU_COMM_TIMEOUT} resp <&${QEMU_OUT[$h]}
+ while IFS= read -t ${QEMU_COMM_TIMEOUT} resp <&${QEMU_OUT[$h]}
do
if [ -z "${silent}" ]; then
echo "${resp}" | _filter_testdir | _filter_qemu \
| _filter_qemu_io | _filter_qmp | _filter_hmp
fi
- grep -q "${*}" < <(echo ${resp})
+ grep -q "${*}" < <(echo "${resp}")
if [ $? -eq 0 ]; then
return
fi
@@ -129,6 +129,7 @@ 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.
+# $qmp_pretty: Set this variable to 'y' to enable QMP pretty printing.
# $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:
@@ -145,7 +146,11 @@ function _launch_qemu()
comm="-monitor stdio"
else
local qemu_comm_method="qmp"
- comm="-monitor none -qmp stdio"
+ if [ "$qmp_pretty" = "y" ]; then
+ comm="-monitor none -qmp-pretty stdio"
+ else
+ comm="-monitor none -qmp stdio"
+ fi
fi
fifo_out=${QEMU_FIFO_OUT}_${_QEMU_HANDLE}
@@ -192,6 +197,9 @@ function _launch_qemu()
then
# Don't print response, since it has version information in it
silent=yes _timed_wait_for ${_QEMU_HANDLE} "capabilities"
+ if [ "$qmp_pretty" = "y" ]; then
+ silent=yes _timed_wait_for ${_QEMU_HANDLE} "^}"
+ fi
fi
QEMU_HANDLE=${_QEMU_HANDLE}
let _QEMU_HANDLE++
--
2.13.5
- [Qemu-devel] [PATCH 0/5] commit: Support multiple roots above top node, Kevin Wolf, 2017/09/25
- [Qemu-devel] [PATCH 2/5] commit: Support multiple roots above top node, Kevin Wolf, 2017/09/25
- [Qemu-devel] [PATCH 1/5] block: Introduce BdrvChildRole.update_filename, Kevin Wolf, 2017/09/25
- [Qemu-devel] [PATCH 3/5] qemu-iotests: Allow QMP pretty printing in common.qemu,
Kevin Wolf <=
- [Qemu-devel] [PATCH 4/5] qemu-iotests: Test commit block job where top has two parents, Kevin Wolf, 2017/09/25
- [Qemu-devel] [PATCH 5/5] commit: Remove overlay_bs, Kevin Wolf, 2017/09/25
- Re: [Qemu-devel] [Qemu-block] [PATCH 0/5] commit: Support multiple roots above top node, John Snow, 2017/09/25