From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHJVT-0006qI-Kc for qemu-devel@nongnu.org; Thu, 07 Jan 2016 17:58:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHJVS-0003i0-RE for qemu-devel@nongnu.org; Thu, 07 Jan 2016 17:58:11 -0500 From: Max Reitz Date: Thu, 7 Jan 2016 23:57:19 +0100 Message-Id: <1452207455-10806-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1452207455-10806-1-git-send-email-mreitz@redhat.com> References: <1452207455-10806-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PULL 05/21] iotests: 018: Use TEST_IMG override instead of "mv" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Fam Zheng , qemu-devel@nongnu.org, Max Reitz From: Fam Zheng Signed-off-by: Fam Zheng Reviewed-by: Max Reitz Message-id: 1450752561-9300-2-git-send-email-famz@redhat.com Signed-off-by: Max Reitz --- tests/qemu-iotests/018 | 8 ++++---- tests/qemu-iotests/018.out | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index d8a7d43..07b2de9 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -66,8 +66,8 @@ _check_test_img echo "Creating test image with backing file" echo -TEST_IMG=$TEST_IMG_SAVE -_make_test_img -b "$TEST_IMG.base" 6G +TEST_IMG="$TEST_IMG_SAVE.orig" +_make_test_img -b "$TEST_IMG_SAVE.base" 6G echo "Filling test image" echo @@ -81,8 +81,8 @@ for offset in $TEST_OFFSETS; do done _check_test_img -mv "$TEST_IMG" "$TEST_IMG.orig" -$QEMU_IMG convert -O $IMGFMT "$TEST_IMG.orig" "$TEST_IMG" +TEST_IMG="$TEST_IMG_SAVE" +$QEMU_IMG convert -f $IMGFMT -O $IMGFMT "$TEST_IMG.orig" "$TEST_IMG" echo "Reading" echo diff --git a/tests/qemu-iotests/018.out b/tests/qemu-iotests/018.out index d66bd63..5df9667 100644 --- a/tests/qemu-iotests/018.out +++ b/tests/qemu-iotests/018.out @@ -269,7 +269,7 @@ wrote 65536/65536 bytes at offset 4295032832 No errors were found on the image. Creating test image with backing file -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base Filling test image === IO: pattern 1 -- 2.6.4