[Qemu-devel] [PATCHv2 09/18] qemu-iotests: fix test 024 to work with any protocol

[Peter Lieven]

Signed-off-by: Peter Lieven <address@hidden>
---
 tests/qemu-iotests/024     |   12 +++++-------
 tests/qemu-iotests/024.out |    4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
index 9bf99e1..1db42df 100755
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024
@@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Currently only qcow2 and qed support rebasing
 _supported_fmt qcow2 qed
-_supported_proto file
+_supported_proto generic
 _supported_os Linux
 
 CLUSTER_SIZE=65536
@@ -60,16 +60,14 @@ CLUSTER_SIZE=65536
 echo "Creating backing file"
 echo
 
-_make_test_img 1G
-io_pattern writev 0 $CLUSTER_SIZE $((2 * CLUSTER_SIZE)) 8 0x11
-mv "$TEST_IMG" "$TEST_IMG.base_old"
+TEST_IMG=$TEST_IMG.base_old _make_test_img 1G
+TEST_IMG=$TEST_IMG.base_old io_pattern writev 0 $CLUSTER_SIZE $((2 * 
CLUSTER_SIZE)) 8 0x11
 
 echo "Creating new backing file"
 echo
 
-_make_test_img 1G
-io_pattern writev 0 $((2 * CLUSTER_SIZE)) $((4 * CLUSTER_SIZE)) 4 0x22
-mv "$TEST_IMG" "$TEST_IMG.base_new"
+TEST_IMG=$TEST_IMG.base_new _make_test_img 1G
+TEST_IMG=$TEST_IMG.base_new io_pattern writev 0 $((2 * CLUSTER_SIZE)) $((4 * 
CLUSTER_SIZE)) 4 0x22
 
 echo "Creating COW image"
 echo
diff --git a/tests/qemu-iotests/024.out b/tests/qemu-iotests/024.out
index e84b973..a52b5a0 100644
--- a/tests/qemu-iotests/024.out
+++ b/tests/qemu-iotests/024.out
@@ -1,7 +1,7 @@
 QA output created by 024
 Creating backing file
 
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
+Formatting 'TEST_DIR/t.IMGFMT.base_old', fmt=IMGFMT size=1073741824 
 === IO: pattern 0x11
 wrote 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -21,7 +21,7 @@ wrote 65536/65536 bytes at offset 917504
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 Creating new backing file
 
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
+Formatting 'TEST_DIR/t.IMGFMT.base_new', fmt=IMGFMT size=1073741824 
 === IO: pattern 0x22
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-- 
1.7.9.5