X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=tests%2Fqemu-iotests%2F018;h=bba30a1be2c85aec658f437b2ac30794d698ee88;hb=093a2af7b67e98808dbb7c5364ac21602bec0881;hp=d8a7d435ab75586ad42ceb7722360a96af4609a2;hpb=9fbee91a131a05e443d7108d7fbdf3ca91020290;p=mirror_qemu.git

diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index d8a7d435ab..bba30a1be2 100755
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -24,8 +24,6 @@ owner=kwolf@redhat.com
 seq=`basename $0`
 echo "QA output created by $seq"
 
-here=`pwd`
-tmp=/tmp/$$
 status=1	# failure is the default!
 
 _cleanup()
@@ -66,8 +64,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 +79,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