diff options
| -rwxr-xr-x | tests/qemu-iotests/009 | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/010 | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/011 | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/013 | 4 | ||||
| -rwxr-xr-x | tests/qemu-iotests/014 | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/015 | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.pattern | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.rc | 3 |
8 files changed, 10 insertions, 9 deletions
diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index 9b29205..00c1633 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 4cf969c..a5bee93 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 c524367..d16a14f 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 ce13218..fda6ce1 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 03a1298..ae932c7 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 a8add14..b5f04e1 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 f1b1829..9e7f2f2 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 c4337d5..a05a250 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() |