On Fri, 12/18 19:18, Max Reitz wrote: > On 16.12.2015 10:54, Fam Zheng wrote: > > Signed-off-by: Fam Zheng <f...@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