From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJKKp-0004Yr-3K for qemu-devel@nongnu.org; Tue, 10 Sep 2013 05:34:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJKKi-00032K-C3 for qemu-devel@nongnu.org; Tue, 10 Sep 2013 05:34:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJKKi-000319-3b for qemu-devel@nongnu.org; Tue, 10 Sep 2013 05:34:04 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8A9Y3Yc001877 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 10 Sep 2013 05:34:03 -0400 From: Max Reitz Date: Tue, 10 Sep 2013 11:33:21 +0200 Message-Id: <1378805602-24044-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1378805602-24044-1-git-send-email-mreitz@redhat.com> References: <1378805602-24044-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 5/6] qemu-iotests: Discard specific info in _img_info List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz In _img_info, filter out additional information specific to the image format provided by qemu-img info, since tests designed for multiple image formats would produce different outputs for every image format else. Signed-off-by: Max Reitz --- tests/qemu-iotests/common.rc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 5e077c3..13f62d8 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -181,12 +181,29 @@ _check_test_img() _img_info() { + discard=0 $QEMU_IMG info "$@" $TEST_IMG 2>&1 | \ sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ -e "s#$TEST_DIR#TEST_DIR#g" \ -e "s#$IMGFMT#IMGFMT#g" \ -e "/^disk size:/ D" \ - -e "/actual-size/ D" + -e "/actual-size/ D" | \ + while IFS='' read line; do + if [ "$line" == "Format specific information:" ]; then + discard=1 + elif [ "`echo "$line" | sed -e 's/^ *//'`" == '"format-specific": {' ]; then + discard=2 + json_indent="`echo "$line" | sed -e 's/^\( *\).*$/\1/'`" + fi + if [ $discard == 0 ]; then + echo "$line" + elif [ $discard == 1 -a -z "$line" ]; then + echo + discard=0 + elif [ $discard == 2 -a "`echo "$line" | sed -e 's/ *$//'`" == "${json_indent}}," ]; then + discard=0 + fi + done } _get_pids_by_name() -- 1.8.3.1