mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-iotests: make a few more tests generic

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2009-07-09 15:26:11 +02:00 committed by Kevin Wolf
parent e021915abd
commit e76a8e893d
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemu-iotests/009
View File

@ -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

2
tests/qemu-iotests/010
View File

@ -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

2
tests/qemu-iotests/011
View File

@ -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

4
tests/qemu-iotests/013
View File

@ -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

2
tests/qemu-iotests/014
View File

@ -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

2
tests/qemu-iotests/015
View File

@ -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

2
tests/qemu-iotests/common.pattern
View File

@ -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]

3
tests/qemu-iotests/common.rc
View File

@ -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()