From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpClv-0005ek-Qt for qemu-devel@nongnu.org; Fri, 14 Nov 2014 04:02:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpCln-0005im-UQ for qemu-devel@nongnu.org; Fri, 14 Nov 2014 04:02:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpCln-0005ii-N4 for qemu-devel@nongnu.org; Fri, 14 Nov 2014 04:02:19 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAE92JAw015789 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 14 Nov 2014 04:02:19 -0500 From: Max Reitz Date: Fri, 14 Nov 2014 10:02:10 +0100 Message-Id: <1415955731-11787-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1415955731-11787-1-git-send-email-mreitz@redhat.com> References: <1415955731-11787-1-git-send-email-mreitz@redhat.com> Subject: [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: 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.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=0 + _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' } # replace driver-specific options in the "Formatting..." line -- 1.9.3