From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZmWA-0003s9-QZ for qemu-devel@nongnu.org; Tue, 07 May 2013 14:21:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZmW5-0004mI-UH for qemu-devel@nongnu.org; Tue, 07 May 2013 14:21:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZmW5-0004m9-Nx for qemu-devel@nongnu.org; Tue, 07 May 2013 14:21:33 -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 r47ILWbG028473 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 7 May 2013 14:21:33 -0400 Date: Tue, 7 May 2013 14:21:18 -0400 From: Jeff Cody Message-ID: <20130507182118.GC30855@localhost.localdomain> References: <1367925185-12988-1-git-send-email-famz@redhat.com> <1367925185-12988-4-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1367925185-12988-4-git-send-email-famz@redhat.com> Subject: Re: [Qemu-devel] [PATCH 3/3] qemu-iotests: fix 017 018 for vmdk List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com On Tue, May 07, 2013 at 07:13:05PM +0800, Fam Zheng wrote: > 017 and 018 use /bin/mv to move base img from t.IMGFMG to t.IMGFMT.base > after filling data, this is not enough for vmdk, when t.IMGFMT is only a > description text file who points to t-{flat,s001,f001,...}.IMGFMT as > data extent, so testing such subformats alway fails on them. > > This patch use the trick of temprorily changing TEST_IMG to avoid using > /bin/mv. s/temprorily/temporarily/ Other than that, I ran the tests locally here and verified vmdk, qcow, qcow2, and qed pass both 17 and 18, so the patch itself looks good to me. > Signed-off-by: Fam Zheng > --- > tests/qemu-iotests/017 | 4 +++- > tests/qemu-iotests/017.out | 2 +- > tests/qemu-iotests/018 | 4 +++- > tests/qemu-iotests/018.out | 2 +- > 4 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 > index 66951eb..45f2c0b 100755 > --- a/tests/qemu-iotests/017 > +++ b/tests/qemu-iotests/017 > @@ -46,6 +46,8 @@ _supported_os Linux > > TEST_OFFSETS="0 4294967296" > > +TEST_IMG_SAVE=$TEST_IMG > +TEST_IMG=$TEST_IMG.base > _make_test_img 6G > > echo "Filling base image" > @@ -63,7 +65,7 @@ _check_test_img > echo "Creating test image with backing file" > echo > > -mv $TEST_IMG $TEST_IMG.base > +TEST_IMG=$TEST_IMG_SAVE > _make_test_img -b $TEST_IMG.base 6G > > echo "Filling test image" > diff --git a/tests/qemu-iotests/017.out b/tests/qemu-iotests/017.out > index a861e58..df34ee7 100644 > --- a/tests/qemu-iotests/017.out > +++ b/tests/qemu-iotests/017.out > @@ -1,5 +1,5 @@ > QA output created by 017 > -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 > +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944 > Filling base image > > === IO: pattern 0 > diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 > index bd2db78..453ce61 100755 > --- a/tests/qemu-iotests/018 > +++ b/tests/qemu-iotests/018 > @@ -46,6 +46,8 @@ _supported_os Linux > > TEST_OFFSETS="0 4294967296" > > +TEST_IMG_SAVE=$TEST_IMG > +TEST_IMG=$TEST_IMG.base > _make_test_img 6G > > echo "Filling base image" > @@ -63,7 +65,7 @@ _check_test_img > echo "Creating test image with backing file" > echo > > -mv $TEST_IMG $TEST_IMG.base > +TEST_IMG=$TEST_IMG_SAVE > _make_test_img -b $TEST_IMG.base 6G > > echo "Filling test image" > diff --git a/tests/qemu-iotests/018.out b/tests/qemu-iotests/018.out > index 6bbd815..3ddb8d8 100644 > --- a/tests/qemu-iotests/018.out > +++ b/tests/qemu-iotests/018.out > @@ -1,5 +1,5 @@ > QA output created by 018 > -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 > +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944 > Filling base image > > === IO: pattern 0 > -- > 1.8.1.4 > >