Patchwork [PATCHv2,11/18] qemu-iotests: fix test 034 to work with any protocol

login
register
mail settings
Submitter Peter Lieven
Date Jan. 5, 2014, 5:22 p.m.
Message ID <1388942528-10453-12-git-send-email-pl@kamp.de>
Download mbox | patch
Permalink /patch/306989/
State New
Headers show

Comments

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

Patch

diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034
index e911d6f..0f95379 100755
--- a/tests/qemu-iotests/034
+++ b/tests/qemu-iotests/034
@@ -39,7 +39,7 @@  trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto file
+_supported_proto generic
 _supported_os Linux
 
 CLUSTER_SIZE=4k
@@ -48,9 +48,8 @@  size=128M
 echo
 echo "== creating backing file for COW tests =="
 
-_make_test_img $size
-$QEMU_IO -c "write -P 0x55 0 1M" "$TEST_IMG" | _filter_qemu_io
-mv "$TEST_IMG" "$TEST_IMG.base"
+TEST_IMG=$TEST_IMG.base _make_test_img $size
+$QEMU_IO -c "write -P 0x55 0 1M" "$TEST_IMG.base" | _filter_qemu_io
 
 _make_test_img -b "$TEST_IMG.base" 6G
 
diff --git a/tests/qemu-iotests/034.out b/tests/qemu-iotests/034.out
index e82dae5..8913644 100644
--- a/tests/qemu-iotests/034.out
+++ b/tests/qemu-iotests/034.out
@@ -1,7 +1,7 @@ 
 QA output created by 034
 
 == 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 1048576/1048576 bytes at offset 0
 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file='TEST_DIR/t.IMGFMT.base'