qemu-iotests: fix 017 018 for vmdk

017 and 018 use /bin/mv to move base img from t.IMGFMG to t.IMGFMT.base
after filling data, this is not enough for vmdk, when t.IMGFMT is only a
description text file who points to t-{flat,s001,f001,...}.IMGFMT as
data extent, so testing such subformats alway fails on them.

This patch use the trick of temprorily changing TEST_IMG to avoid using
/bin/mv.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 66951eb1a86fc9d40e4675934ca20ad0ce60654f..45f2c0b0556c3ce9fdf2b2b1576a3617e67d69fd 100755 (executable)
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -46,6 +46,8 @@ _supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 
+TEST_IMG_SAVE=$TEST_IMG
+TEST_IMG=$TEST_IMG.base
 _make_test_img 6G
 
 echo "Filling base image"
@@ -63,7 +65,7 @@ _check_test_img
 echo "Creating test image with backing file"
 echo
 
-mv $TEST_IMG $TEST_IMG.base
+TEST_IMG=$TEST_IMG_SAVE
 _make_test_img -b $TEST_IMG.base 6G
 
 echo "Filling test image"

diff --git a/tests/qemu-iotests/017.out b/tests/qemu-iotests/017.out
index a861e58331dfbc5c0f7943c3d8154b4a4ce7644a..df34ee78c478c6718148ef8d451e9e80a1d2b927 100644 (file)
--- a/tests/qemu-iotests/017.out
+++ b/tests/qemu-iotests/017.out
@@ -1,5 +1,5 @@
 QA output created by 017
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
 Filling base image
 
 === IO: pattern 0

diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index bd2db787151f984276262346a2dca8e31ac1c6b1..453ce61e75e161927e73661600e206ec39c72960 100755 (executable)
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -46,6 +46,8 @@ _supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 
+TEST_IMG_SAVE=$TEST_IMG
+TEST_IMG=$TEST_IMG.base
 _make_test_img 6G
 
 echo "Filling base image"
@@ -63,7 +65,7 @@ _check_test_img
 echo "Creating test image with backing file"
 echo
 
-mv $TEST_IMG $TEST_IMG.base
+TEST_IMG=$TEST_IMG_SAVE
 _make_test_img -b $TEST_IMG.base 6G
 
 echo "Filling test image"

diff --git a/tests/qemu-iotests/018.out b/tests/qemu-iotests/018.out
index 6bbd815ce798fc953652134edaab7f74cff1fda7..3ddb8d8f6fa7c5c511bc06428c7ebe29bb70255c 100644 (file)
--- a/tests/qemu-iotests/018.out
+++ b/tests/qemu-iotests/018.out
@@ -1,5 +1,5 @@
 QA output created by 018
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
 Filling base image
 
 === IO: pattern 0