diff mbox

[PATCHv2,15/18] qemu-iotests: fix test 046 to work with any protocol

Message ID 1388942528-10453-16-git-send-email-pl@kamp.de
State New
Headers show

Commit Message

Peter Lieven Jan. 5, 2014, 5:22 p.m. UTC 
Signed-off-by: Peter Lieven <pl@kamp.de>
---
 tests/qemu-iotests/046     |    9 +++------
 tests/qemu-iotests/046.out |    2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index 2d44bbb..2a69a11 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -39,7 +39,7 @@  trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto generic
 _supported_os Linux
 
 CLUSTER_SIZE=64k
@@ -48,8 +48,6 @@  size=128M
 echo
 echo "== creating backing file for COW tests =="
 
-_make_test_img $size
-
 function backing_io()
 {
     local offset=$1
@@ -66,9 +64,8 @@  function backing_io()
     done
 }
 
-backing_io 0 32 write | $QEMU_IO "$TEST_IMG" | _filter_qemu_io
-
-mv "$TEST_IMG" "$TEST_IMG.base"
+TEST_IMG=$TEST_IMG.base _make_test_img $size
+backing_io 0 32 write | $QEMU_IO "$TEST_IMG.base" | _filter_qemu_io
 
 _make_test_img -b "$TEST_IMG.base" 6G
 
diff --git a/tests/qemu-iotests/046.out b/tests/qemu-iotests/046.out
index 65d584b..d1d49d8 100644
--- a/tests/qemu-iotests/046.out
+++ b/tests/qemu-iotests/046.out
@@ -1,7 +1,7 @@ 
 QA output created by 046
 
 == creating backing file for COW tests ==
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 
 wrote 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 wrote 65536/65536 bytes at offset 65536