diff options
| author | Fam Zheng <famz@redhat.com> | 2013-05-07 19:13:05 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2013-05-08 15:28:50 +0200 |
| commit | 794d00f71d39e3d18eafade579b2ecb665d6d481 (patch) | |
| tree | 86215138e8c4249a5488bbc4ab3870f47fb371e7 /tests/qemu-iotests | |
| parent | dbcdd7cb04595cc0015f2dba6be751faa63fab00 (diff) | |
| download | qemu-794d00f71d39e3d18eafade579b2ecb665d6d481.tar.gz qemu-794d00f71d39e3d18eafade579b2ecb665d6d481.tar.bz2 qemu-794d00f71d39e3d18eafade579b2ecb665d6d481.zip | |
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>
Diffstat (limited to 'tests/qemu-iotests')
| -rwxr-xr-x | tests/qemu-iotests/017 | 4 | ||||
| -rw-r--r-- | tests/qemu-iotests/017.out | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/018 | 4 | ||||
| -rw-r--r-- | tests/qemu-iotests/018.out | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index 66951eb1a8..45f2c0b055 100755 --- 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 a861e58331..df34ee78c4 100644 --- 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 bd2db78715..453ce61e75 100755 --- 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 6bbd815ce7..3ddb8d8f6f 100644 --- 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 |