From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41294)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1aBCoa-0007FU-1E
	for qemu-devel@nongnu.org; Mon, 21 Dec 2015 21:36:40 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1aBCoZ-0003VW-2x
	for qemu-devel@nongnu.org; Mon, 21 Dec 2015 21:36:39 -0500
Date: Tue, 22 Dec 2015 10:36:31 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20151222023631.GA4478@ad.usersys.redhat.com>
References: <1450259693-25595-1-git-send-email-famz@redhat.com>
	<1450259693-25595-11-git-send-email-famz@redhat.com>
	<56744DF0.80106@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <56744DF0.80106@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 10/10] iotests: 095: Use TEST_IMG override
	instead of "mv"
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: Max Reitz <mreitz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, jcody@redhat.com, jsnow@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org

On Fri, 12/18 19:18, Max Reitz wrote:
> On 16.12.2015 10:54, Fam Zheng wrote:
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  tests/qemu-iotests/095     | 12 ++++++------
> >  tests/qemu-iotests/095.out |  8 ++++----
> >  2 files changed, 10 insertions(+), 10 deletions(-)
> > 
> > diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
> > index 6630181..cbe61bc 100755
> > --- a/tests/qemu-iotests/095
> > +++ b/tests/qemu-iotests/095
> > @@ -50,17 +50,16 @@ _supported_os Linux
> >  size_smaller=5M
> >  size_larger=100M
> >  
> > -_make_test_img $size_smaller
> > -mv "${TEST_IMG}" "${TEST_IMG}.base"
> > +TEST_IMG="$TEST_IMG.base _make_test_img $size_smaller"
> 
> I think this should be:
> 
> TEST_IMG="$TEST_IMG.base" _make_test_img $size_smaller

Yes, it's a regex search-replace error. Will fix.

> 
> >  
> > -_make_test_img -b "${TEST_IMG}.base" $size_larger
> > -mv "${TEST_IMG}" "${TEST_IMG}.snp1"
> > +TEST_IMG="$TEST_IMG.snp1 _make_test_img -b "${TEST_IMG}.base" $size_larger"
> 
> TEST_IMG="$TEST_IMG.snp1" _make_test_img -b "${TEST_IMG}.base" \
>     $size_larger
> 
> (Also, you could strip the {} because the inconsistent usage looks a bit
> strange inside of a single line.)

Okay.

> 
> >  
> >  _make_test_img -b "${TEST_IMG}.snp1" $size_larger
> >  
> >  echo
> >  echo "=== Base image info before commit and resize ==="
> > -TEST_IMG="${TEST_IMG}.base" _img_info
> > +TEST_IMG="${TEST_IMG}.base" _img_info | \
> > +    sed -e 's/^cluster_size: .*$/cluster_size: XXX/'
> 
> How about using _filter_img_info instead?

Will drop this change and do it in a separate patch.

Thanks!

Fam