Re: [Qemu-devel] [PATCH for-2.0 08/47] qemu-iotests: Support for bochs format

[Max Reitz <mreitz@redhat.com>]

On 26.03.2014 13:05, Stefan Hajnoczi wrote:
> From: Kevin Wolf <kwolf@redhat.com>
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   tests/qemu-iotests/078                           |  53 +++++++++++++++++++++++
>   tests/qemu-iotests/078.out                       |   6 +++
>   tests/qemu-iotests/common                        |   7 +++
>   tests/qemu-iotests/group                         |   1 +
>   tests/qemu-iotests/sample_images/empty.bochs.bz2 | Bin 0 -> 118 bytes
>   5 files changed, 67 insertions(+)
>   create mode 100755 tests/qemu-iotests/078
>   create mode 100644 tests/qemu-iotests/078.out
>   create mode 100644 tests/qemu-iotests/sample_images/empty.bochs.bz2
>
> diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078
> new file mode 100755
> index 0000000..f55f46d
> --- /dev/null
> +++ b/tests/qemu-iotests/078
> @@ -0,0 +1,53 @@
> +#!/bin/bash
> +#
> +# bochs format input validation tests
> +#
> +# Copyright (C) 2013 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=kwolf@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 bochs
> +_supported_proto generic
> +_supported_os Linux
> +
> +echo
> +echo "== Read from a valid image =="
> +_use_sample_img empty.bochs.bz2
> +{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir

Is there a special reason for the braces here? Also, $TEST_IMG is not 
quoted (sample applies to patch 2).

> +
> +# success, all done
> +echo "*** done"
> +rm -f $seq.full
> +status=0
> diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out
> new file mode 100644
> index 0000000..25d37c5
> --- /dev/null
> +++ b/tests/qemu-iotests/078.out
> @@ -0,0 +1,6 @@
> +QA output created by 078
> +
> +== Read from a valid image ==
> +read 512/512 bytes at offset 0
> +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> +*** done
> diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
> index 37e3bed..a09d9c8 100644
> --- a/tests/qemu-iotests/common
> +++ b/tests/qemu-iotests/common
> @@ -136,6 +136,7 @@ common options
>   
>   check options
>       -raw                test raw (default)
> +    -bochs              test bochs
>       -cow                test cow
>       -cloop              test cloop
>       -qcow               test qcow
> @@ -174,6 +175,12 @@ testlist options
>               xpand=false
>               ;;
>   
> +        -bochs)
> +            IMGFMT=bochs
> +            IMGFMT_GENERIC=false
> +            xpand=false
> +            ;;
> +
>           -cow)
>               IMGFMT=cow
>               xpand=false
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index 633e82d..ecba432 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -83,6 +83,7 @@
>   074 rw auto quick
>   075 rw auto
>   077 rw auto quick
> +078 rw auto
>   079 rw auto
>   081 rw auto
>   082 rw auto quick
> diff --git a/tests/qemu-iotests/sample_images/empty.bochs.bz2 b/tests/qemu-iotests/sample_images/empty.bochs.bz2
> new file mode 100644
> index 0000000000000000000000000000000000000000..7a29c6ed763407f2de067d2618e6a60fb23812b8
> GIT binary patch
> literal 118
> zcmZ>Y%CIzaj8qGbEHvXuW?+ykpYp%q0D}XA$OAzJz31~91b}P?js*-MrV1$+l1$i~
> z-4}9X&0;tqx7fiX<AheW%Z6AkV-}vCX-a&`bK=V?6cx(PyWI7EdEsra!@~6!wUt9A
> V{S18A!=S+OU%bfGB47f@9suImDUARC
>
> literal 0
> HcmV?d00001
>

I can live with unquoted $TEST_IMG for now (to get this into 2.0), but I 
think this should be fixed in a follow-up patch.

Reviewed-by: Max Reitz <mreitz@redhat.com>