From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqLSl-0007CY-FJ for qemu-devel@nongnu.org; Mon, 17 Nov 2014 07:31:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqLSb-0000V2-SW for qemu-devel@nongnu.org; Mon, 17 Nov 2014 07:31:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqLSb-0000Ux-LS for qemu-devel@nongnu.org; Mon, 17 Nov 2014 07:31:13 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAHCVDCM018446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 17 Nov 2014 07:31:13 -0500 From: Max Reitz Date: Mon, 17 Nov 2014 13:31:05 +0100 Message-Id: <1416227466-29491-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1416227466-29491-1-git-send-email-mreitz@redhat.com> References: <1416227466-29491-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v4 2/3] iotests: _filter_qmp for pretty JSON output List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi , Max Reitz _filter_qmp should be able to correctly filter out the QMP version object for pretty JSON output. Signed-off-by: Max Reitz --- tests/qemu-iotests/common.filter | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 3acdb30..dfb9726 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -167,7 +167,9 @@ _filter_qmp() { _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\' \ + -e ' QMP_VERSION' } # replace driver-specific options in the "Formatting..." line -- 1.9.3