From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpGwI-0000bv-MU for qemu-devel@nongnu.org; Fri, 14 Nov 2014 08:29:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpGwD-0001ms-OR for qemu-devel@nongnu.org; Fri, 14 Nov 2014 08:29:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpGwD-0001lx-FF for qemu-devel@nongnu.org; Fri, 14 Nov 2014 08:29:21 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAEDTJSI016831 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 14 Nov 2014 08:29:20 -0500 Message-ID: <546603AE.90509@redhat.com> Date: Fri, 14 Nov 2014 06:29:18 -0700 From: Eric Blake MIME-Version: 1.0 References: <1415955731-11787-1-git-send-email-mreitz@redhat.com> <1415955731-11787-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1415955731-11787-3-git-send-email-mreitz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rusdquUxl8rvB8BNu2wxbHNW3k5jjmpdt" Subject: Re: [Qemu-devel] [PATCH v2 2/3] iotests: _filter_qmp for pretty JSON output List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz , qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --rusdquUxl8rvB8BNu2wxbHNW3k5jjmpdt Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/14/2014 02:02 AM, Max Reitz wrote: > _filter_qmp should be able to correctly filter out the QMP version > object for pretty JSON output. >=20 > Signed-off-by: Max Reitz > --- > tests/qemu-iotests/common.filter | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) >=20 > diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/comm= on.filter > index 3acdb30..63d15b3 100644 > --- a/tests/qemu-iotests/common.filter > +++ b/tests/qemu-iotests/common.filter > @@ -165,9 +165,12 @@ _filter_qemu() > # replace problematic QMP output like timestamps > _filter_qmp() > { > + discard=3D0 > + > _filter_win32 | \ > sed -e 's#\("\(micro\)\?seconds": \)[0-9]\+#\1 TIMESTAMP#g' \ > - -e 's#^{"QMP":.*}$#QMP_VERSION#' > + -e 's#^{"QMP":.*}$#QMP_VERSION#' \ > + -e '/^ "QMP": {\s*$/, /^ }\s*$/ c\ QMP_VERSION' Technically, portable sed requires a newline between the initial 'c\' and the first line of replacement. Use of multiple -e is the easiest way to provide newlines (sed concatenates separate -e strings with an implicit newline). Even though GNU sed doesn't barf on your variant, I'd still prefer: -e '/^ "QMP": {/, /^ }/ c\' \ -e ' QMP_VERSION' written as two lines, to ensure we don't upset BSD sed. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --rusdquUxl8rvB8BNu2wxbHNW3k5jjmpdt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg iQEcBAEBCAAGBQJUZgOuAAoJEKeha0olJ0Nq7SYH/0cX/wqFk98eC9c+Xx/qYm1B aeql4LxsWG4CYJurMRBhaSLkFl0Tm6IcanrVdn27zXDonaTcEn8ST0fP4OInrDT9 5N1px9oAyIaQQhShTtNyqMZktfA/j67v2g569BAuFY9JhMe3LuvqYpmh6JvF/Bs8 ZXwJB0ZJ4Qu/cGxcZyNKPL4rFPG03kgQ5YxXpU6FSJ8/DiyX3purdTAuax01PrqN DNnu3VdWHe4wbKVPE+cKVCZ9A98BG69wnnTw4JJYBUAOdCpBb6Lea0tPxJyH2NH1 aaGgJnDM9EOj18kHznx/rGbYyhb8Cb8gPKV43NSiHcZHPFOCT8BlefziEga83AY= =CB+Y -----END PGP SIGNATURE----- --rusdquUxl8rvB8BNu2wxbHNW3k5jjmpdt--