Re: [Qemu-devel] [PATCH v2 11/21] iotests: Prepare for refcount_width option

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1564 bytes --]

On 11/14/2014 06:06 AM, Max Reitz wrote:
> Some tests do not work well with certain refcount widths (i.e. you
> cannot create internal snapshots with refcount_width=1), so make those
> widths unsupported.
> 
> Furthermore, add another filter to _filter_img_create in common.filter
> which filters out the refcount_width value.
> 
> This is necessary for test 079, which does actually work with any
> refcount width, but invoking qemu-img directly leads to the
> refcount_width value being visible in the output; use _make_test_img
> instead which will filter it out.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---

> +++ b/tests/qemu-iotests/029
> @@ -44,6 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>  _supported_fmt qcow2
>  _supported_proto generic
>  _supported_os Linux
> +_unsupported_imgopts 'refcount_width=1[^0-9]'

Missed a comment here.

> +++ b/tests/qemu-iotests/common.filter
> @@ -190,7 +190,8 @@ _filter_img_create()
>          -e "s# block_size=[0-9]\\+##g" \
>          -e "s# block_state_zero=\\(on\\|off\\)##g" \
>          -e "s# log_size=[0-9]\\+##g" \
> -        -e "s/archipelago:a/TEST_DIR\//g"
> +        -e "s/archipelago:a/TEST_DIR\//g" \
> +        -e "s# refcount_width=[0-9]\\+##g"

I'm not convinced that \+ is portable sed; but as you are not the first
use, it's not worth changing.

Once you add the remaining comment,
Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 539 bytes --]