Signed-off-by: Peter Lieven <p...@kamp.de> --- tests/qemu-iotests/020 | 24 +++++++++++------------- tests/qemu-iotests/020.out | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index a42f32f..55358ac 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -43,29 +43,28 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files _supported_fmt qcow qcow2 vmdk qed -_supported_proto file +_supported_proto generic _supported_os Linux TEST_OFFSETS="0 4294967296" -_make_test_img 6G +TEST_IMG=$TEST_IMG.base _make_test_img 6G echo "Filling base image" echo for offset in $TEST_OFFSETS; do # Some clusters with alternating backing file/image file reads - io writev $(( offset )) 512 1024 64 + TEST_IMG=$TEST_IMG.base io writev $(( offset )) 512 1024 64 # Complete backing clusters - io writev $(( offset + 64 * 1024)) 65536 65536 1 + TEST_IMG=$TEST_IMG.base io writev $(( offset + 64 * 1024)) 65536 65536 1 done -_check_test_img +TEST_IMG=$TEST_IMG.base _check_test_img echo "Creating test image with backing file" echo -mv "$TEST_IMG" "$TEST_IMG.base" _make_test_img -b "$TEST_IMG.base" 6G echo "Filling test image" @@ -81,24 +80,23 @@ done _check_test_img $QEMU_IMG commit "$TEST_IMG" -mv "$TEST_IMG.base" "$TEST_IMG" echo "Reading from the backing file" echo for offset in $TEST_OFFSETS; do # Some clusters with alternating backing file/image file reads - io readv $(( offset )) 512 1024 64 - io readv $(( offset + 512 )) 512 1024 64 + TEST_IMG=$TEST_IMG.base io readv $(( offset )) 512 1024 64 + TEST_IMG=$TEST_IMG.base io readv $(( offset + 512 )) 512 1024 64 # Complete test image clusters - io readv $(( offset + 64 * 1024)) 65536 65536 1 - io readv $(( offset + 64 * 1024 + 65536)) 65536 65536 1 + TEST_IMG=$TEST_IMG.base io readv $(( offset + 64 * 1024)) 65536 65536 1 + TEST_IMG=$TEST_IMG.base io readv $(( offset + 64 * 1024 + 65536)) 65536 65536 1 # Empty sectors - io_zero readv $(( offset + 64 * 1024 + 65536 * 4 )) 65536 65536 1 + TEST_IMG=$TEST_IMG.base io_zero readv $(( offset + 64 * 1024 + 65536 * 4 )) 65536 65536 1 done -_check_test_img +TEST_IMG=$TEST_IMG.base _check_test_img # success, all done echo "*** done" diff --git a/tests/qemu-iotests/020.out b/tests/qemu-iotests/020.out index fc9a63c..90a6271 100644 --- a/tests/qemu-iotests/020.out +++ b/tests/qemu-iotests/020.out @@ -1,5 +1,5 @@ QA output created by 020 -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 -- 1.7.9.5