From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9zbu-00060p-AT for qemu-devel@nongnu.org; Fri, 18 Dec 2015 13:18:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9zbt-0005sq-EJ for qemu-devel@nongnu.org; Fri, 18 Dec 2015 13:18:34 -0500 References: <1450259693-25595-1-git-send-email-famz@redhat.com> <1450259693-25595-11-git-send-email-famz@redhat.com> From: Max Reitz Message-ID: <56744DF0.80106@redhat.com> Date: Fri, 18 Dec 2015 19:18:24 +0100 MIME-Version: 1.0 In-Reply-To: <1450259693-25595-11-git-send-email-famz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="QTuWOMM1ku5NW8fEI3hoOUH43RjcRh7BH" Subject: Re: [Qemu-devel] [PATCH 10/10] iotests: 095: Use TEST_IMG override instead of "mv" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , jcody@redhat.com, jsnow@redhat.com, qemu-block@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --QTuWOMM1ku5NW8fEI3hoOUH43RjcRh7BH Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable On 16.12.2015 10:54, Fam Zheng wrote: > Signed-off-by: Fam Zheng > --- > tests/qemu-iotests/095 | 12 ++++++------ > tests/qemu-iotests/095.out | 8 ++++---- > 2 files changed, 10 insertions(+), 10 deletions(-) >=20 > diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 > index 6630181..cbe61bc 100755 > --- a/tests/qemu-iotests/095 > +++ b/tests/qemu-iotests/095 > @@ -50,17 +50,16 @@ _supported_os Linux > size_smaller=3D5M > size_larger=3D100M > =20 > -_make_test_img $size_smaller > -mv "${TEST_IMG}" "${TEST_IMG}.base" > +TEST_IMG=3D"$TEST_IMG.base _make_test_img $size_smaller" I think this should be: TEST_IMG=3D"$TEST_IMG.base" _make_test_img $size_smaller > =20 > -_make_test_img -b "${TEST_IMG}.base" $size_larger > -mv "${TEST_IMG}" "${TEST_IMG}.snp1" > +TEST_IMG=3D"$TEST_IMG.snp1 _make_test_img -b "${TEST_IMG}.base" $size_= larger" TEST_IMG=3D"$TEST_IMG.snp1" _make_test_img -b "${TEST_IMG}.base" \ $size_larger (Also, you could strip the {} because the inconsistent usage looks a bit strange inside of a single line.) > =20 > _make_test_img -b "${TEST_IMG}.snp1" $size_larger > =20 > echo > echo "=3D=3D=3D Base image info before commit and resize =3D=3D=3D" > -TEST_IMG=3D"${TEST_IMG}.base" _img_info > +TEST_IMG=3D"${TEST_IMG}.base" _img_info | \ > + sed -e 's/^cluster_size: .*$/cluster_size: XXX/' How about using _filter_img_info instead? Max > echo > echo =3D=3D=3D Running QEMU Live Commit Test =3D=3D=3D > @@ -78,7 +77,8 @@ _send_qemu_cmd $h "{ 'execute': 'block-commit', > =20 > echo > echo "=3D=3D=3D Base image info after commit and resize =3D=3D=3D" > -TEST_IMG=3D"${TEST_IMG}.base" _img_info > +TEST_IMG=3D"${TEST_IMG}.base" _img_info | \ > + sed -e 's/^cluster_size: .*$/cluster_size: XXX/' > =20 > # success, all done > echo "*** done" > diff --git a/tests/qemu-iotests/095.out b/tests/qemu-iotests/095.out > index 2360061..b95111e 100644 > --- a/tests/qemu-iotests/095.out > +++ b/tests/qemu-iotests/095.out > @@ -1,13 +1,13 @@ > QA output created by 095 > -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D5242880 > -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D104857600 backing_= file=3DTEST_DIR/t.IMGFMT.base > +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D5242880 > +Formatting 'TEST_DIR/t.IMGFMT.snp1', fmt=3DIMGFMT size=3D104857600 bac= king_file=3DTEST_DIR/t.IMGFMT.base > Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D104857600 backing_= file=3DTEST_DIR/t.IMGFMT.snp1 > =20 > =3D=3D=3D Base image info before commit and resize =3D=3D=3D > image: TEST_DIR/t.IMGFMT.base > file format: IMGFMT > virtual size: 5.0M (5242880 bytes) > -cluster_size: 65536 > +cluster_size: XXX > =20 > =3D=3D=3D Running QEMU Live Commit Test =3D=3D=3D > =20 > @@ -19,5 +19,5 @@ cluster_size: 65536 > image: TEST_DIR/t.IMGFMT.base > file format: IMGFMT > virtual size: 100M (104857600 bytes) > -cluster_size: 65536 > +cluster_size: XXX > *** done >=20 --QTuWOMM1ku5NW8fEI3hoOUH43RjcRh7BH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWdE3wAAoJEDuxQgLoOKytc30H/jOipWUlh5Wm0Pwgh7UK6wQj VckDrfbJ/Tv2G0ZbY0aiKdEc6IgQ3QSZKtVyAnGxKAdZuCNEBb9XRbFE9Ndn3/bm UpZg+IYQVWJTnaJSRvusmiluwLslxKEgFzCC5z454NvKbQidZ+Y4gc48Hm/3w+mM q99Hndo9P87/UdGyk2glncyogQzFHn5FasryzYcbb5RD2pSmAtrAtJUnox2T+H8a at6H2qdPMxNmb9TbxrYMq/reoaZ90fl15Lzr4jEmib86+/yIkvhLg7P7DmzkTelv WCCuowgeiu3Zh2b11E8Vun4aSs2rXrtksE05xXiz+NHgiKUeGpIdNLkFh4pUi6k= =JAJf -----END PGP SIGNATURE----- --QTuWOMM1ku5NW8fEI3hoOUH43RjcRh7BH--