From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJeol-0004KM-23 for qemu-devel@nongnu.org; Wed, 11 Sep 2013 03:26:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJeof-0003SZ-8D for qemu-devel@nongnu.org; Wed, 11 Sep 2013 03:26:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJeoe-0003SN-Vv for qemu-devel@nongnu.org; Wed, 11 Sep 2013 03:26:21 -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 r8B7QJnW002906 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 11 Sep 2013 03:26:19 -0400 Message-ID: <52301B18.3030308@redhat.com> Date: Wed, 11 Sep 2013 09:26:16 +0200 From: Max Reitz MIME-Version: 1.0 References: <1378805602-24044-1-git-send-email-mreitz@redhat.com> <1378805602-24044-7-git-send-email-mreitz@redhat.com> <20130911062318.GA28768@T430s.nay.redhat.com> In-Reply-To: <20130911062318.GA28768@T430s.nay.redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 6/6] qemu-iotests: Additional info from qemu-img info List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: famz@redhat.com Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi On 2013-09-11 08:23, Fam Zheng wrote: > On Tue, 09/10 11:33, Max Reitz wrote: >> Add a test for the additional information now provided by qemu-img inf= o >> when used on qcow2 images. >> >> Signed-off-by: Max Reitz >> --- >> tests/qemu-iotests/064 | 72 ++++++++++++++++++++++++++++++++++++= ++++++++++ >> tests/qemu-iotests/064.out | 22 ++++++++++++++ >> tests/qemu-iotests/group | 1 + >> 3 files changed, 95 insertions(+) >> create mode 100755 tests/qemu-iotests/064 >> create mode 100644 tests/qemu-iotests/064.out >> >> diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 >> new file mode 100755 >> index 0000000..4979db5 >> --- /dev/null >> +++ b/tests/qemu-iotests/064 >> @@ -0,0 +1,72 @@ >> +#!/bin/bash >> +# >> +# Test for additional information emitted by qemu-img info on qcow2 >> +# images >> +# >> +# Copyright (C) 2013 Red Hat, Inc. >> +# >> +# This program is free software; you can redistribute it and/or modif= y >> +# it under the terms of the GNU General Public License as published b= y >> +# the Free Software Foundation; either version 2 of the License, or >> +# (at your option) any later version. >> +# >> +# This program is distributed in the hope that it will be useful, >> +# but WITHOUT ANY WARRANTY; without even the implied warranty of >> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> +# GNU General Public License for more details. >> +# >> +# You should have received a copy of the GNU General Public License >> +# along with this program. If not, see . >> +# >> + >> +# creator >> +owner=3Dmreitz@redhat.com >> + >> +seq=3D`basename $0` >> +echo "QA output created by $seq" >> + >> +here=3D`pwd` >> +tmp=3D/tmp/$$ >> +status=3D1 # failure is the default! >> + >> +_cleanup() >> +{ >> + _cleanup_test_img >> +} >> +trap "_cleanup; exit \$status" 0 1 2 3 15 >> + >> +# get standard environment, filters and checks >> +. ./common.rc >> +. ./common.filter >> + >> +# This tests qocw2-specific low-level functionality >> +_supported_fmt qcow2 >> +_supported_proto generic >> +_supported_os Linux >> + >> +IMG_SIZE=3D64M >> + >> +echo >> +echo "=3D=3D=3D Testing qcow2 image with -o compat=3D0.10 =3D=3D=3D" >> +echo >> +IMGOPTS=3D"compat=3D0.10" _make_test_img $IMG_SIZE >> +# don't use _img_info, since that function will filter out the >> +# additional information we're about to test for >> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 4= 2 > For curiosity, where's 42 from? I want to read all format specific information there, and because this=20 is the last information emitted by qemu_img -info, I have to grep=20 everything after the line "Format specific information:" until EOF =96 I=20 didn't find an easy way to do this, so I just chose a number of lines=20 which seemed enough to fetch all of that format specific info=20 (currently, 2 would suffice). > Fam > >> + >> +echo >> +echo "=3D=3D=3D Testing qcow2 image with -o compat=3D1.1,lazy_refcoun= ts=3Doff =3D=3D=3D" >> +echo >> +IMGOPTS=3D"compat=3D1.1,lazy_refcounts=3Doff" _make_test_img $IMG_SIZ= E >> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 4= 2 >> + >> +echo >> +echo "=3D=3D=3D Testing qcow2 image with -o compat=3D1.1,lazy_refcoun= ts=3Don =3D=3D=3D" >> +echo >> +IMGOPTS=3D"compat=3D1.1,lazy_refcounts=3Don" _make_test_img $IMG_SIZE >> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 4= 2 >> + >> +# success, all done >> +echo "*** done" >> +rm -f $seq.full >> +status=3D0 >> diff --git a/tests/qemu-iotests/064.out b/tests/qemu-iotests/064.out >> new file mode 100644 >> index 0000000..6ce5b43 >> --- /dev/null >> +++ b/tests/qemu-iotests/064.out >> @@ -0,0 +1,22 @@ >> +QA output created by 064 >> + >> +=3D=3D=3D Testing qcow2 image with -o compat=3D0.10 =3D=3D=3D >> + >> +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 >> +Format specific information: >> +compat: 0.10 >> + >> +=3D=3D=3D Testing qcow2 image with -o compat=3D1.1,lazy_refcounts=3Do= ff =3D=3D=3D >> + >> +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 >> +Format specific information: >> +compat: 1.1 >> +lazy refcounts: false >> + >> +=3D=3D=3D Testing qcow2 image with -o compat=3D1.1,lazy_refcounts=3Do= n =3D=3D=3D >> + >> +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 >> +Format specific information: >> +compat: 1.1 >> +lazy refcounts: true >> +*** done >> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group >> index b696242..740cd84 100644 >> --- a/tests/qemu-iotests/group >> +++ b/tests/qemu-iotests/group >> @@ -66,3 +66,4 @@ >> 059 rw auto >> 060 rw auto >> 062 rw auto >> +064 rw auto >> --=20 >> 1.8.3.1 >> Max