Commit bff55548 authored by John Snow's avatar John Snow Committed by Kevin Wolf
Browse files

iotests: fix 197 for vpc 



VPC has some difficulty creating geometries of particular size.
However, we can indeed force it to use a literal one, so let's
do that for the sake of test 197, which is testing some specific
offsets.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarLukáš Doktor <ldoktor@redhat.com>
parent 5fbfabd3

tests/qemu-iotests/197

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ echo '=== Copy-on-read ===' 
echo



# Prep the images

# VPC rounds image sizes to a specific geometry, force a specific size.

if [ "$IMGFMT" = "vpc" ]; then

    IMGOPTS=$(_optstr_add "$IMGOPTS" "force_size")

fi

_make_test_img 4G

$QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io

IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \

tests/qemu-iotests/common.filter

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ _filter_img_create() 
        -e "s# log_size=[0-9]\\+##g" \

        -e "s# refcount_bits=[0-9]\\+##g" \

        -e "s# key-secret=[a-zA-Z0-9]\\+##g" \

        -e "s# iter-time=[0-9]\\+##g"

        -e "s# iter-time=[0-9]\\+##g" \

        -e "s# force_size=\\(on\\|off\\)##g"

}



_filter_img_info()