From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQz7m-0002yV-Fq for qemu-devel@nongnu.org; Tue, 01 Oct 2013 08:32:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQz7g-0001Oe-CT for qemu-devel@nongnu.org; Tue, 01 Oct 2013 08:32:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQz7g-0001O6-4C for qemu-devel@nongnu.org; Tue, 01 Oct 2013 08:32:16 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r91CWFiC011745 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 1 Oct 2013 08:32:15 -0400 From: Max Reitz Date: Tue, 1 Oct 2013 14:32:01 +0200 Message-Id: <1380630722-19430-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1380630722-19430-1-git-send-email-mreitz@redhat.com> References: <1380630722-19430-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v6 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 otherwise. Signed-off-by: Max Reitz --- tests/qemu-iotests/common.rc | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 1b22db0..73b7dde 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -197,12 +197,30 @@ _check_test_img() _img_info() { + discard=0 + regex_json_spec_start='^ *"format-specific": \{' $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 [[ $line =~ $regex_json_spec_start ]]; then + discard=2 + regex_json_spec_end="^${line%%[^ ]*}\\}, *$" + fi + if [[ $discard == 0 ]]; then + echo "$line" + elif [[ $discard == 1 && ! $line ]]; then + echo + discard=0 + elif [[ $discard == 2 && $line =~ $regex_json_spec_end ]]; then + discard=0 + fi + done } _get_pids_by_name() -- 1.8.3.1