Re: [Qemu-devel] [PATCH v6 08/11] block: add support for --image-opts in block I/O tests

[Eric Blake <eblake@redhat.com>]

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

On 03/21/2016 08:11 AM, Daniel P. Berrange wrote:
> Currently all block tests use the traditional syntax for images
> just specifying a filename. To support the LUKS driver without
> resorting to JSON, the tests need to be able to use the new
> --image-opts argument to qemu-img and qemu-io.
> 
> This introduces a new env variable IMGOPTSSYNTAX. If this is

Would IMG_OPTS_SYNTAX be any more legible?

> set to 'true', then qemu-img/qemu-io should use --image-opts.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  tests/qemu-iotests/common        |  7 ++++-
>  tests/qemu-iotests/common.config | 15 +++++++++--
>  tests/qemu-iotests/common.rc     | 58 +++++++++++++++++++++++++++++-----------
>  3 files changed, 62 insertions(+), 18 deletions(-)
> 
> diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
> index ff84f4b..05c9df2 100644
> --- a/tests/qemu-iotests/common
> +++ b/tests/qemu-iotests/common
> @@ -53,6 +53,7 @@ export QEMU_IO_OPTIONS=""
>  export CACHEMODE_IS_DEFAULT=true
>  export QEMU_OPTIONS="-nodefaults"
>  export VALGRIND_QEMU=
> +export IMGOPTSSYNTAX=false

Particularly since we use _ between words in other variables above.


> @@ -199,7 +221,13 @@ _cleanup_test_img()
>  
>  _check_test_img()
>  {
> -    $QEMU_IMG check "$@" -f $IMGFMT "$TEST_IMG" 2>&1 | _filter_testdir | \
> +    (
> +        if [ "$IMGOPTSSYNTAX" = "true" ]; then
> +            $QEMU_IMG check --image-opts "$@" "$TEST_IMG" 2>&1
> +        else
> +            $QEMU_IMG check "$@" -f $IMGFMT "$TEST_IMG" 2>&1
> +        fi
> +    ) | _filter_testdir | \

Would '{ if ... fi; } |' be any better than a subshell?

But the idea looks to be on track.

-- 
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: 604 bytes --]