On Thu, Feb 20, 2014 at 03:57:23PM +0100, Kevin Wolf wrote:
> Signed-off-by: Kevin Wolf <kw...@redhat.com>
> ---
>  tests/qemu-iotests/082     | 187 +++++++++++++++++++
>  tests/qemu-iotests/082.out | 436 
> +++++++++++++++++++++++++++++++++++++++++++++
>  tests/qemu-iotests/group   |   1 +
>  3 files changed, 624 insertions(+)
>  create mode 100755 tests/qemu-iotests/082
>  create mode 100644 tests/qemu-iotests/082.out
> 
> diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
> new file mode 100755
> index 0000000..10a4b1e
> --- /dev/null
> +++ b/tests/qemu-iotests/082
> @@ -0,0 +1,187 @@
> +#!/bin/bash
> +#
> +# Test qemu-img command line parsing
> +#
> +# Copyright (C) 2014 Red Hat, Inc.
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +#
> +
> +# creator
> +owner=kw...@redhat.com
> +
> +seq=`basename $0`
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1     # failure is the default!
> +
> +_cleanup()
> +{
> +     _cleanup_test_img
> +}
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +# get standard environment, filters and checks
> +. ./common.rc
> +. ./common.filter
> +
> +_supported_fmt qcow2
> +_supported_proto file
> +_supported_os Linux
> +
> +function run_qemu_img()
> +{
> +    echo
> +    echo Testing: "$@" | _filter_testdir
> +    $QEMU_IMG "$@" 2>&1 | _filter_testdir

$QEMU_IMG needs quoted: "$QEMU_IMG"

> +}
> +
> +size=128M
> +
> +echo
> +echo === create: Options specified more than once ===
> +
> +# Last -f should win
> +run_qemu_img create -f foo -f $IMGFMT $TEST_IMG $size
> +run_qemu_img info $TEST_IMG
> +
> +# Multiple -o should be merged
> +run_qemu_img create -f $IMGFMT -o cluster_size=4k -o lazy_refcounts=on 
> $TEST_IMG $size

s/\$TEST_IMG/\$\"TEST_IMG\"/g

After those two changes, ./check -qcow2 082 runs fine in my spaced
directory test.


> +run_qemu_img info $TEST_IMG
> +
> +# If the same -o key is specified more than once, the last one wins
> +run_qemu_img create -f $IMGFMT -o cluster_size=4k -o lazy_refcounts=on -o 
> cluster_size=8k $TEST_IMG $size
> +run_qemu_img info $TEST_IMG
> +run_qemu_img create -f $IMGFMT -o cluster_size=4k,cluster_size=8k $TEST_IMG 
> $size
> +run_qemu_img info $TEST_IMG
> +
> +echo
> +echo === create: help for -o ===
> +
> +# Adding the help option to a command without other -o options
> +run_qemu_img create -f $IMGFMT -o help $TEST_IMG $size
> +run_qemu_img create -f $IMGFMT -o \? $TEST_IMG $size
> +
> +# Adding the help option to the same -o option
> +run_qemu_img create -f $IMGFMT -o cluster_size=4k,help $TEST_IMG $size
> +run_qemu_img create -f $IMGFMT -o cluster_size=4k,\? $TEST_IMG $size
> +
> +# Adding the help option to a separate -o option
> +run_qemu_img create -f $IMGFMT -o cluster_size=4k -o help $TEST_IMG $size
> +run_qemu_img create -f $IMGFMT -o cluster_size=4k -o \? $TEST_IMG $size
> +
> +# Looks like a help option, but is part of the backing file name
> +run_qemu_img create -f $IMGFMT -o backing_file=$TEST_IMG,,help $TEST_IMG 
> $size
> +run_qemu_img create -f $IMGFMT -o backing_file=$TEST_IMG,,\? $TEST_IMG $size
> +
> +# Leave out everything that isn't needed
> +run_qemu_img create -f $IMGFMT -o help
> +run_qemu_img create -o help
> +
> +echo
> +echo === convert: Options specified more than once ===
> +
> +# We need a valid source image
> +run_qemu_img create -f $IMGFMT $TEST_IMG $size
> +
> +# Last -f should win
> +run_qemu_img convert -f foo -f $IMGFMT $TEST_IMG $TEST_IMG.base
> +run_qemu_img info $TEST_IMG.base
> +
> +# Last -O should win
> +run_qemu_img convert -O foo -O $IMGFMT $TEST_IMG $TEST_IMG.base
> +run_qemu_img info $TEST_IMG.base
> +
> +# Multiple -o should be merged
> +run_qemu_img convert -O $IMGFMT -o cluster_size=4k -o lazy_refcounts=on 
> $TEST_IMG $TEST_IMG.base
> +run_qemu_img info $TEST_IMG.base
> +
> +# If the same -o key is specified more than once, the last one wins
> +run_qemu_img convert -O $IMGFMT -o cluster_size=4k -o lazy_refcounts=on -o 
> cluster_size=8k $TEST_IMG $TEST_IMG.base
> +run_qemu_img info $TEST_IMG.base
> +run_qemu_img convert -O $IMGFMT -o cluster_size=4k,cluster_size=8k $TEST_IMG 
> $TEST_IMG.base
> +run_qemu_img info $TEST_IMG.base
> +
> +echo
> +echo === convert: help for -o ===
> +
> +# Adding the help option to a command without other -o options
> +run_qemu_img convert -O $IMGFMT -o help $TEST_IMG $TEST_IMG.base
> +run_qemu_img convert -O $IMGFMT -o \? $TEST_IMG $TEST_IMG.base
> +
> +# Adding the help option to the same -o option
> +run_qemu_img convert -O $IMGFMT -o cluster_size=4k,help $TEST_IMG 
> $TEST_IMG.base
> +run_qemu_img convert -O $IMGFMT -o cluster_size=4k,\? $TEST_IMG 
> $TEST_IMG.base
> +
> +# Adding the help option to a separate -o option
> +run_qemu_img convert -O $IMGFMT -o cluster_size=4k -o help $TEST_IMG 
> $TEST_IMG.base
> +run_qemu_img convert -O $IMGFMT -o cluster_size=4k -o \? $TEST_IMG 
> $TEST_IMG.base
> +
> +# Looks like a help option, but is part of the backing file name
> +run_qemu_img convert -O $IMGFMT -o backing_file=$TEST_IMG,,help $TEST_IMG 
> $TEST_IMG.base
> +run_qemu_img convert -O $IMGFMT -o backing_file=$TEST_IMG,,\? $TEST_IMG 
> $TEST_IMG.base
> +
> +# Leave out everything that isn't needed
> +run_qemu_img convert -O $IMGFMT -o help
> +run_qemu_img convert -o help
> +
> +echo
> +echo === amend: Options specified more than once ===
> +
> +# Last -f should win
> +run_qemu_img amend -f foo -f $IMGFMT -o lazy_refcounts=on $TEST_IMG
> +run_qemu_img info $TEST_IMG
> +
> +# Multiple -o should be merged
> +run_qemu_img amend -f $IMGFMT -o size=130M -o lazy_refcounts=off $TEST_IMG
> +run_qemu_img info $TEST_IMG
> +
> +# If the same -o key is specified more than once, the last one wins
> +run_qemu_img amend -f $IMGFMT -o size=8M -o lazy_refcounts=on -o size=132M 
> $TEST_IMG
> +run_qemu_img info $TEST_IMG
> +run_qemu_img amend -f $IMGFMT -o size=4M,size=148M $TEST_IMG
> +run_qemu_img info $TEST_IMG
> +
> +echo
> +echo === amend: help for -o ===
> +
> +# Adding the help option to a command without other -o options
> +run_qemu_img amend -f $IMGFMT -o help $TEST_IMG
> +run_qemu_img amend -f $IMGFMT -o \? $TEST_IMG
> +
> +# Adding the help option to the same -o option
> +run_qemu_img amend -f $IMGFMT -o cluster_size=4k,help $TEST_IMG
> +run_qemu_img amend -f $IMGFMT -o cluster_size=4k,\? $TEST_IMG
> +
> +# Adding the help option to a separate -o option
> +run_qemu_img amend -f $IMGFMT -o cluster_size=4k -o help $TEST_IMG
> +run_qemu_img amend -f $IMGFMT -o cluster_size=4k -o \? $TEST_IMG
> +
> +# Looks like a help option, but is part of the backing file name
> +run_qemu_img amend -f $IMGFMT -o backing_file=$TEST_IMG,,help $TEST_IMG
> +run_qemu_img rebase -u -b "" -f $IMGFMT $TEST_IMG
> +
> +run_qemu_img amend -f $IMGFMT -o backing_file=$TEST_IMG,,\? $TEST_IMG
> +run_qemu_img rebase -u -b "" -f $IMGFMT $TEST_IMG
> +
> +# Leave out everything that isn't needed
> +run_qemu_img amend -f $IMGFMT -o help
> +run_qemu_img convert -o help
> +
> +# success, all done
> +echo "*** done"
> +rm -f $seq.full
> +status=0
> diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
> new file mode 100644
> index 0000000..b775d00
> --- /dev/null
> +++ b/tests/qemu-iotests/082.out
> @@ -0,0 +1,436 @@
> +QA output created by 082
> +
> +=== create: Options specified more than once ===
> +
> +Testing: create -f foo -f qcow2 TEST_DIR/t.qcow2 128M
> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 encryption=off 
> cluster_size=65536 lazy_refcounts=off 
> +
> +Testing: info TEST_DIR/t.qcow2
> +image: TEST_DIR/t.qcow2
> +file format: qcow2
> +virtual size: 128M (134217728 bytes)
> +disk size: 196K
> +cluster_size: 65536
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: false
> +
> +Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on 
> TEST_DIR/t.qcow2 128M
> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 encryption=off 
> cluster_size=4096 lazy_refcounts=on 
> +
> +Testing: info TEST_DIR/t.qcow2
> +image: TEST_DIR/t.qcow2
> +file format: qcow2
> +virtual size: 128M (134217728 bytes)
> +disk size: 16K
> +cluster_size: 4096
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: true
> +
> +Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on -o 
> cluster_size=8k TEST_DIR/t.qcow2 128M
> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 encryption=off 
> cluster_size=8192 lazy_refcounts=on 
> +
> +Testing: info TEST_DIR/t.qcow2
> +image: TEST_DIR/t.qcow2
> +file format: qcow2
> +virtual size: 128M (134217728 bytes)
> +disk size: 28K
> +cluster_size: 8192
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: true
> +
> +Testing: create -f qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 
> 128M
> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 encryption=off 
> cluster_size=8192 lazy_refcounts=off 
> +
> +Testing: info TEST_DIR/t.qcow2
> +image: TEST_DIR/t.qcow2
> +file format: qcow2
> +virtual size: 128M (134217728 bytes)
> +disk size: 28K
> +cluster_size: 8192
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: false
> +
> +=== create: help for -o ===
> +
> +Testing: create -f qcow2 -o help TEST_DIR/t.qcow2 128M
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: create -f qcow2 -o ? TEST_DIR/t.qcow2 128M
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: create -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 128M
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: create -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 128M
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: create -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 128M
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: create -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 128M
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: create -f qcow2 -o backing_file=TEST_DIR/t.qcow2,,help 
> TEST_DIR/t.qcow2 128M
> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 
> backing_file='TEST_DIR/t.qcow2,help' encryption=off cluster_size=65536 
> lazy_refcounts=off 
> +
> +Testing: create -f qcow2 -o backing_file=TEST_DIR/t.qcow2,,? 
> TEST_DIR/t.qcow2 128M
> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 
> backing_file='TEST_DIR/t.qcow2,?' encryption=off cluster_size=65536 
> lazy_refcounts=off 
> +
> +Testing: create -f qcow2 -o help
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: create -o help
> +Supported options:
> +size             Virtual disk size
> +
> +=== convert: Options specified more than once ===
> +
> +Testing: create -f qcow2 TEST_DIR/t.qcow2 128M
> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 encryption=off 
> cluster_size=65536 lazy_refcounts=off 
> +
> +Testing: convert -f foo -f qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
> +
> +Testing: info TEST_DIR/t.qcow2.base
> +image: TEST_DIR/t.qcow2.base
> +file format: raw
> +virtual size: 128M (134217728 bytes)
> +disk size: 0
> +
> +Testing: convert -O foo -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
> +
> +Testing: info TEST_DIR/t.qcow2.base
> +image: TEST_DIR/t.qcow2.base
> +file format: qcow2
> +virtual size: 128M (134217728 bytes)
> +disk size: 196K
> +cluster_size: 65536
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: false
> +
> +Testing: convert -O qcow2 -o cluster_size=4k -o lazy_refcounts=on 
> TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
> +
> +Testing: info TEST_DIR/t.qcow2.base
> +image: TEST_DIR/t.qcow2.base
> +file format: qcow2
> +virtual size: 128M (134217728 bytes)
> +disk size: 16K
> +cluster_size: 4096
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: true
> +
> +Testing: convert -O qcow2 -o cluster_size=4k -o lazy_refcounts=on -o 
> cluster_size=8k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
> +
> +Testing: info TEST_DIR/t.qcow2.base
> +image: TEST_DIR/t.qcow2.base
> +file format: qcow2
> +virtual size: 128M (134217728 bytes)
> +disk size: 28K
> +cluster_size: 8192
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: true
> +
> +Testing: convert -O qcow2 -o cluster_size=4k,cluster_size=8k 
> TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
> +
> +Testing: info TEST_DIR/t.qcow2.base
> +image: TEST_DIR/t.qcow2.base
> +file format: qcow2
> +virtual size: 128M (134217728 bytes)
> +disk size: 28K
> +cluster_size: 8192
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: false
> +
> +=== convert: help for -o ===
> +
> +Testing: convert -O qcow2 -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: convert -O qcow2 -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: convert -O qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 
> TEST_DIR/t.qcow2.base
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: convert -O qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 
> TEST_DIR/t.qcow2.base
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: convert -O qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 
> TEST_DIR/t.qcow2.base
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: convert -O qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 
> TEST_DIR/t.qcow2.base
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2,,help 
> TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
> +qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing 
> file: Could not open 'TEST_DIR/t.qcow2,help': No such file or directory
> +
> +Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2,,? 
> TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
> +qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing 
> file: Could not open 'TEST_DIR/t.qcow2,?': No such file or directory
> +
> +Testing: convert -O qcow2 -o help
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: convert -o help
> +Supported options:
> +size             Virtual disk size
> +
> +=== amend: Options specified more than once ===
> +
> +Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2
> +
> +Testing: info TEST_DIR/t.qcow2
> +image: TEST_DIR/t.qcow2
> +file format: qcow2
> +virtual size: 128M (134217728 bytes)
> +disk size: 196K
> +cluster_size: 65536
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: true
> +
> +Testing: amend -f qcow2 -o size=130M -o lazy_refcounts=off TEST_DIR/t.qcow2
> +
> +Testing: info TEST_DIR/t.qcow2
> +image: TEST_DIR/t.qcow2
> +file format: qcow2
> +virtual size: 130M (136314880 bytes)
> +disk size: 196K
> +cluster_size: 65536
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: false
> +
> +Testing: amend -f qcow2 -o size=8M -o lazy_refcounts=on -o size=132M 
> TEST_DIR/t.qcow2
> +
> +Testing: info TEST_DIR/t.qcow2
> +image: TEST_DIR/t.qcow2
> +file format: qcow2
> +virtual size: 132M (138412032 bytes)
> +disk size: 196K
> +cluster_size: 65536
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: true
> +
> +Testing: amend -f qcow2 -o size=4M,size=148M TEST_DIR/t.qcow2
> +
> +Testing: info TEST_DIR/t.qcow2
> +image: TEST_DIR/t.qcow2
> +file format: qcow2
> +virtual size: 148M (155189248 bytes)
> +disk size: 196K
> +cluster_size: 65536
> +Format specific information:
> +    compat: 1.1
> +    lazy refcounts: true
> +
> +=== amend: help for -o ===
> +
> +Testing: amend -f qcow2 -o help TEST_DIR/t.qcow2
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: amend -f qcow2 -o ? TEST_DIR/t.qcow2
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: amend -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: amend -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: amend -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: amend -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2,,help 
> TEST_DIR/t.qcow2
> +
> +Testing: rebase -u -b  -f qcow2 TEST_DIR/t.qcow2
> +
> +Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2,,? TEST_DIR/t.qcow2
> +
> +Testing: rebase -u -b  -f qcow2 TEST_DIR/t.qcow2
> +
> +Testing: amend -f qcow2 -o help
> +Supported options:
> +size             Virtual disk size
> +compat           Compatibility level (0.10 or 1.1)
> +backing_file     File name of a base image
> +backing_fmt      Image format of the base image
> +encryption       Encrypt the image
> +cluster_size     qcow2 cluster size
> +preallocation    Preallocation mode (allowed values: off, metadata)
> +lazy_refcounts   Postpone refcount updates
> +
> +Testing: convert -o help
> +Supported options:
> +size             Virtual disk size
> +*** done
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index d8be74a..80b181f 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -83,3 +83,4 @@
>  074 rw auto
>  077 rw auto
>  079 rw auto
> +082 rw auto quick
> -- 
> 1.8.1.4
> 
> 

Reply via email to