aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-07-09 15:26:11 +0200
committerKevin Wolf <kwolf@redhat.com>2012-02-22 16:17:01 +0100
commite76a8e893d2b005cb966bfbfff4bbba8f7cd302d (patch)
tree40c926e0514463785690f614a823abc306a134c6 /tests
parente021915abd06d10c7a20dfd589407e7c4d6a313f (diff)
qemu-iotests: make a few more tests generic
Pretend that a non-implemented check is always successful and thus allow various tests that were qcow2-specific before to be generic. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qemu-iotests/0092
-rwxr-xr-xtests/qemu-iotests/0102
-rwxr-xr-xtests/qemu-iotests/0112
-rwxr-xr-xtests/qemu-iotests/0134
-rwxr-xr-xtests/qemu-iotests/0142
-rwxr-xr-xtests/qemu-iotests/0152
-rw-r--r--tests/qemu-iotests/common.pattern2
-rw-r--r--tests/qemu-iotests/common.rc3
8 files changed, 10 insertions, 9 deletions
diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index 9b2920557..00c16330f 100755
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.rc
. ./common.filter
-_supported_fmt qcow2
+_supported_fmt generic
_supported_os Linux
diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index 4cf969cd6..a5bee937f 100755
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.rc
. ./common.filter
-_supported_fmt qcow2
+_supported_fmt generic
_supported_os Linux
diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index c524367b1..d16a14fad 100755
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.rc
. ./common.filter
-_supported_fmt qcow2
+_supported_fmt generic
_supported_os Linux
diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013
index ce13218ce..fda6ce1ff 100755
--- a/tests/qemu-iotests/013
+++ b/tests/qemu-iotests/013
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.pattern
# much of this could be generic for any format supporting compression.
-_supported_fmt qcow2
+_supported_fmt qcow qcow2
_supported_os Linux
TEST_OFFSETS="0 4294967296"
@@ -66,7 +66,7 @@ echo "Compressing image"
echo
mv $TEST_IMG $TEST_IMG.orig
-$QEMU_IMG convert -f qcow2 -O qcow2 -c $TEST_IMG.orig $TEST_IMG
+$QEMU_IMG convert -f $IMGFMT -O $IMGFMT -c $TEST_IMG.orig $TEST_IMG
echo "Testing compressed image"
echo
diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index 03a1298a8..ae932c721 100755
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter
. ./common.pattern
-# much of this could be generic for any format supporting compression.
+# much of this could be generic for any format supporting snapshots
_supported_fmt qcow2
_supported_os Linux
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index a8add14a7..b5f04e1a1 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.rc
. ./common.filter
-# currently only qcow2 allows for consistency checks using qemu-img
+# actually any format that supports snapshots
_supported_fmt qcow2
_supported_os Linux
diff --git a/tests/qemu-iotests/common.pattern b/tests/qemu-iotests/common.pattern
index f1b18296d..9e7f2f20d 100644
--- a/tests/qemu-iotests/common.pattern
+++ b/tests/qemu-iotests/common.pattern
@@ -96,7 +96,7 @@ function io_test2() {
io_pattern writev $((offset + 8 * 4096)) 4096 $((9 * 4096)) 256 165
mv $TEST_IMG $TEST_IMG.orig
- $QEMU_IMG convert -f qcow2 -O qcow2 -c $TEST_IMG.orig $TEST_IMG
+ $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -c $TEST_IMG.orig $TEST_IMG
# Write the used clusters
echo === Used clusters [1]
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index c4337d50c..a05a250d7 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -75,7 +75,8 @@ _cleanup_test_img()
_check_test_img()
{
- $QEMU_IMG check -f $IMGFMT $TEST_IMG
+ $QEMU_IMG check -f $IMGFMT $TEST_IMG 2>&1 | \
+ sed -e 's/qemu-img\: This image format does not support checks/No errors were found on the image./'
}
_get_pids_by_name()