iotests: 019: Use TEST_IMG override instead of "mv"

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1450752561-9300-3-git-send-email-famz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Fam Zheng 2015-12-22 10:49:12 +08:00 committed by Max Reitz
parent 9b337ae90a
commit f2bbcd3f7f
2 changed files with 9 additions and 8 deletions

View File

@ -54,6 +54,9 @@ _unsupported_imgopts "subformat=monolithicFlat" \
TEST_OFFSETS="0 4294967296" TEST_OFFSETS="0 4294967296"
CLUSTER_SIZE=65536 CLUSTER_SIZE=65536
TEST_IMG_SAVE="$TEST_IMG"
TEST_IMG="$TEST_IMG.base"
_make_test_img 6G _make_test_img 6G
echo "Filling base image" echo "Filling base image"
@ -71,8 +74,8 @@ _check_test_img
echo "Creating test image with backing file" echo "Creating test image with backing file"
echo echo
mv "$TEST_IMG" "$TEST_IMG.base" TEST_IMG="$TEST_IMG_SAVE.orig"
_make_test_img -b "$TEST_IMG.base" 6G _make_test_img -b "$TEST_IMG_SAVE.base" 6G
echo "Filling test image" echo "Filling test image"
echo echo
@ -86,9 +89,7 @@ for offset in $TEST_OFFSETS; do
done done
_check_test_img _check_test_img
mv "$TEST_IMG" "$TEST_IMG.orig" TEST_IMG="$TEST_IMG_SAVE"
# Test the conversion twice: One test with the old-style -B option and another # Test the conversion twice: One test with the old-style -B option and another
# one with -o backing_file # one with -o backing_file
@ -98,7 +99,7 @@ for backing_option in "-B " "-o backing_file="; do
echo echo
echo Testing conversion with $backing_option"$TEST_IMG.base" | _filter_testdir | _filter_imgfmt echo Testing conversion with $backing_option"$TEST_IMG.base" | _filter_testdir | _filter_imgfmt
echo echo
$QEMU_IMG convert -O $IMGFMT $backing_option"$TEST_IMG.base" "$TEST_IMG.orig" "$TEST_IMG" $QEMU_IMG convert -f $IMGFMT -O $IMGFMT $backing_option"$TEST_IMG.base" "$TEST_IMG.orig" "$TEST_IMG"
echo "Checking if backing clusters are allocated when they shouldn't" echo "Checking if backing clusters are allocated when they shouldn't"
echo echo

View File

@ -1,5 +1,5 @@
QA output created by 019 QA output created by 019
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
Filling base image Filling base image
=== IO: pattern 42 === IO: pattern 42
@ -269,7 +269,7 @@ wrote 65536/65536 bytes at offset 4296015872
No errors were found on the image. No errors were found on the image.
Creating test image with backing file 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 Filling test image
=== IO: pattern 43 === IO: pattern 43