From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoBao-00069A-66 for qemu-devel@nongnu.org; Tue, 11 Nov 2014 08:34:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoBai-0007Rp-1r for qemu-devel@nongnu.org; Tue, 11 Nov 2014 08:34:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54724) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoBah-0007Rf-QP for qemu-devel@nongnu.org; Tue, 11 Nov 2014 08:34:39 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sABDYdqc032479 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 11 Nov 2014 08:34:39 -0500 From: Max Reitz Date: Tue, 11 Nov 2014 14:34:32 +0100 Message-Id: <1415712873-29274-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1415712873-29274-1-git-send-email-mreitz@redhat.com> References: <1415712873-29274-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 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 , Markus Armbruster , Max Reitz , Stefan Hajnoczi , Paolo Bonzini _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 | 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 + discard=1 + echo ' QMP_VERSION' + fi + if [[ $discard == 0 ]]; then + echo "$line" + elif [[ $discard == 1 && $line == ' }' ]]; then + discard=0 + fi + done } # replace driver-specific options in the "Formatting..." line -- 1.9.3