From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46427)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1W02nV-0000mX-E7
	for qemu-devel@nongnu.org; Mon, 06 Jan 2014 00:32:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1W02nQ-0002Hc-A6
	for qemu-devel@nongnu.org; Mon, 06 Jan 2014 00:32:21 -0500
Received: from mx1.redhat.com ([209.132.183.28]:28513)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1W02nQ-0002GM-19
	for qemu-devel@nongnu.org; Mon, 06 Jan 2014 00:32:16 -0500
Message-ID: <52CA3FC2.8060609@redhat.com>
Date: Mon, 06 Jan 2014 13:31:46 +0800
From: Fam Zheng <famz@redhat.com>
MIME-Version: 1.0
References: <1388942528-10453-1-git-send-email-pl@kamp.de>
	<1388942528-10453-5-git-send-email-pl@kamp.de>
In-Reply-To: <1388942528-10453-5-git-send-email-pl@kamp.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCHv2 04/18] qemu-iotests: fix test 013 to work
	with any protocol
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Lieven <pl@kamp.de>, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, ronniesahlberg@gmail.com, Jeff Cody <jcody@redhat.com>, Max Reitz <mreitz@redhat.com>, owasserm@redhat.com, Federico Simoncelli <fsimonce@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Wenchao Xia <xiawenc@linux.vnet.ibm.com>

On 2014=E5=B9=B401=E6=9C=8806=E6=97=A5 01:21, Peter Lieven wrote:
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>   tests/qemu-iotests/013     |    9 ++++-----
>   tests/qemu-iotests/013.out |    2 +-
>   2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013
> index ea3cab9..0dbc934 100755
> --- a/tests/qemu-iotests/013
> +++ b/tests/qemu-iotests/013
> @@ -41,14 +41,14 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
>   # much of this could be generic for any format supporting compression.
>   _supported_fmt qcow qcow2
> -_supported_proto file
> +_supported_proto generic
>   _supported_os Linux
>
>   TEST_OFFSETS=3D"0 4294967296"
>   TEST_OPS=3D"writev read write readv"
>   CLUSTER_SIZE=3D4096
>

I think dropping these three TEST_IMG overriding change...

> -_make_test_img 6G
> +TEST_IMG=3D$TEST_IMG.orig _make_test_img 6G

#1

>
>   echo "Testing empty image"
>   echo
> @@ -56,16 +56,15 @@ echo
>   for offset in $TEST_OFFSETS; do
>       echo "At offset $offset:"
>       for op in $TEST_OPS; do
> -        io_test $op $offset $CLUSTER_SIZE 8
> +        TEST_IMG=3D$TEST_IMG.orig io_test $op $offset $CLUSTER_SIZE 8

#2

>       done
> -    _check_test_img
> +    TEST_IMG=3D$TEST_IMG.orig _check_test_img

#3

>   done
>
>
>   echo "Compressing image"
>   echo
>
> -mv "$TEST_IMG" "$TEST_IMG.orig"

and changing this to

TEST_IMG=3D$TEST_IMG.orig _make_test_img 6G

Should work.

>   $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -c "$TEST_IMG.orig" "$TEST_IM=
G"
>
>   echo "Testing compressed image"
> diff --git a/tests/qemu-iotests/013.out b/tests/qemu-iotests/013.out
> index 43a414c..763cb0c 100644
> --- a/tests/qemu-iotests/013.out
> +++ b/tests/qemu-iotests/013.out
> @@ -1,5 +1,5 @@
>   QA output created by 013
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D6442450944
> +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=3DIMGFMT size=3D6442450944

So this is not necessary.

Fam