Signed-off-by: Peter Lieven <address@hidden>
---
tests/qemu-iotests/018 | 22 +++++++++-------------
tests/qemu-iotests/018.out | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index aa9d3cb..fecf281 100755
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -41,46 +41,42 @@ 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"
-TEST_IMG_SAVE=$TEST_IMG
-TEST_IMG=$TEST_IMG.base
-_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
-TEST_IMG=$TEST_IMG_SAVE
-_make_test_img -b "$TEST_IMG.base" 6G
+TEST_IMG=$TEST_IMG.orig _make_test_img -b "$TEST_IMG.base" 6G
echo "Filling test image"
echo
for offset in $TEST_OFFSETS; do
# Some clusters with alternating backing file/image file reads
- io writev $(( offset + 512 )) 512 1024 64
+ TEST_IMG=$TEST_IMG.orig io writev $(( offset + 512 )) 512 1024 64
# Complete test image clusters
- io writev $(( offset + 64 * 1024 + 65536)) 65536 65536 1
+ TEST_IMG=$TEST_IMG.orig io writev $(( offset + 64 * 1024 + 65536)) 65536
65536 1
done
-_check_test_img
+TEST_IMG=$TEST_IMG.orig _check_test_img
-mv "$TEST_IMG" "$TEST_IMG.orig"