From: Max Reitz <mreitz@redhat.com>
To: Eric Blake <eblake@redhat.com>, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 2/3] iotests: _filter_qmp for pretty JSON output
Date: Wed, 12 Nov 2014 09:33:40 +0100 [thread overview]
Message-ID: <54631B64.5080704@redhat.com> (raw)
In-Reply-To: <5462E67E.7000607@redhat.com>
On 2014-11-12 at 05:47, Eric Blake wrote:
> On 11/11/2014 06:34 AM, Max Reitz wrote:
>> _filter_qmp should be able to correctly filter out the QMP version
>> object for pretty JSON output.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>> tests/qemu-iotests/common.filter | 16 +++++++++++++++-
>> 1 file changed, 15 insertions(+), 1 deletion(-)
>>
>> diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
>> index 3acdb30..e24dab4 100644
>> --- a/tests/qemu-iotests/common.filter
>> +++ b/tests/qemu-iotests/common.filter
>> @@ -165,9 +165,23 @@ _filter_qemu()
>> # replace problematic QMP output like timestamps
>> _filter_qmp()
>> {
>> + discard=0
>> +
>> _filter_win32 | \
>> sed -e 's#\("\(micro\)\?seconds": \)[0-9]\+#\1 TIMESTAMP#g' \
>> - -e 's#^{"QMP":.*}$#QMP_VERSION#'
>> + -e 's#^{"QMP":.*}$#QMP_VERSION#' \
>> + -e 's#\\#\\\\#g' | \
>> + while IFS='' read line; do
>> + if [[ $line == ' "QMP": {' ]]; then
> Good that this is a /bin/bash script and not /bin/sh :)
Ah, right, yes, I just copied the code I had written for filtering out
the image-specific information from the qemu-img info output.
> But - is it really worth doing this in shell? Why not just do it in sed?
Because I don't know sed well enough. ;-)
> sed -e ... \
> -e 's#\\#\\\\#g' \
> -e '/ "QMP": {/,/ }/ c\' \
> -e ' QMP_VERSION'
Will do, thanks.
Max
next prev parent reply other threads:[~2014-11-12 8:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-11 13:34 [Qemu-devel] [PATCH 0/3] chardev: Add -qmp-pretty Max Reitz
2014-11-11 13:34 ` [Qemu-devel] [PATCH 1/3] " Max Reitz
2014-11-12 4:41 ` Eric Blake
2014-11-12 8:32 ` Max Reitz
2014-11-11 13:34 ` [Qemu-devel] [PATCH 2/3] iotests: _filter_qmp for pretty JSON output Max Reitz
2014-11-12 4:47 ` Eric Blake
2014-11-12 8:33 ` Max Reitz [this message]
2014-11-12 13:19 ` Eric Blake
2014-11-11 13:34 ` [Qemu-devel] [PATCH 3/3] iotests: Use -qmp-pretty in 067 Max Reitz
2014-11-12 4:51 ` Eric Blake
2014-11-12 8:34 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54631B64.5080704@redhat.com \
--to=mreitz@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).