From patchwork Fri Sep 6 13:12:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 273193 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4B95A2C0107 for ; Fri, 6 Sep 2013 23:16:28 +1000 (EST) Received: from localhost ([::1]:37584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHvti-0001pT-BV for incoming@patchwork.ozlabs.org; Fri, 06 Sep 2013 09:16:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHvr0-0006FM-Sb for qemu-devel@nongnu.org; Fri, 06 Sep 2013 09:13:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHvqu-0005Nc-Tj for qemu-devel@nongnu.org; Fri, 06 Sep 2013 09:13:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48307) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHvqu-0005NS-LW for qemu-devel@nongnu.org; Fri, 06 Sep 2013 09:13:32 -0400 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 r86DDWk4031634 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 6 Sep 2013 09:13:32 -0400 Received: from localhost (ovpn-116-61.ams2.redhat.com [10.36.116.61]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r86DDTjH010429 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Fri, 6 Sep 2013 09:13:31 -0400 From: Max Reitz To: qemu-devel@nongnu.org Date: Fri, 6 Sep 2013 15:12:33 +0200 Message-Id: <1378473154-30057-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1378473154-30057-1-git-send-email-mreitz@redhat.com> References: <1378473154-30057-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v2 5/6] qemu-iotests: Discard specific info in _img_info X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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()