From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a98oZ-0000bE-QE for qemu-devel@nongnu.org; Wed, 16 Dec 2015 04:56:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a98oY-0006RI-Cc for qemu-devel@nongnu.org; Wed, 16 Dec 2015 04:56:07 -0500 From: Fam Zheng Date: Wed, 16 Dec 2015 17:54:53 +0800 Message-Id: <1450259693-25595-11-git-send-email-famz@redhat.com> In-Reply-To: <1450259693-25595-1-git-send-email-famz@redhat.com> References: <1450259693-25595-1-git-send-email-famz@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: Kevin Wolf , jcody@redhat.com, jsnow@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Signed-off-by: Fam Zheng --- tests/qemu-iotests/095 | 12 ++++++------ tests/qemu-iotests/095.out | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) 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=5M size_larger=100M -_make_test_img $size_smaller -mv "${TEST_IMG}" "${TEST_IMG}.base" +TEST_IMG="$TEST_IMG.base _make_test_img $size_smaller" -_make_test_img -b "${TEST_IMG}.base" $size_larger -mv "${TEST_IMG}" "${TEST_IMG}.snp1" +TEST_IMG="$TEST_IMG.snp1 _make_test_img -b "${TEST_IMG}.base" $size_larger" _make_test_img -b "${TEST_IMG}.snp1" $size_larger echo echo "=== Base image info before commit and resize ===" -TEST_IMG="${TEST_IMG}.base" _img_info +TEST_IMG="${TEST_IMG}.base" _img_info | \ + sed -e 's/^cluster_size: .*$/cluster_size: XXX/' echo echo === Running QEMU Live Commit Test === @@ -78,7 +77,8 @@ _send_qemu_cmd $h "{ 'execute': 'block-commit', echo echo "=== Base image info after commit and resize ===" -TEST_IMG="${TEST_IMG}.base" _img_info +TEST_IMG="${TEST_IMG}.base" _img_info | \ + sed -e 's/^cluster_size: .*$/cluster_size: XXX/' # 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=IMGFMT size=5242880 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=104857600 backing_file=TEST_DIR/t.IMGFMT.base +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=5242880 +Formatting 'TEST_DIR/t.IMGFMT.snp1', fmt=IMGFMT size=104857600 backing_file=TEST_DIR/t.IMGFMT.base Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=104857600 backing_file=TEST_DIR/t.IMGFMT.snp1 === Base image info before commit and resize === image: TEST_DIR/t.IMGFMT.base file format: IMGFMT virtual size: 5.0M (5242880 bytes) -cluster_size: 65536 +cluster_size: XXX === Running QEMU Live Commit Test === @@ -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 -- 2.4.3