[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH 10/10] iotests: 095: Use TEST_IMG override inste
From: |
Max Reitz |
Subject: |
Re: [Qemu-block] [PATCH 10/10] iotests: 095: Use TEST_IMG override instead of "mv" |
Date: |
Fri, 18 Dec 2015 19:18:24 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 |
On 16.12.2015 10:54, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <address@hidden>
> ---
> 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
>
> -_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.)
>
> _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?
Max
> echo
> echo === Running QEMU Live Commit Test ===
> @@ -78,7 +77,8 @@ _send_qemu_cmd $h "{ 'execute': 'block-commit',
>
> echo
> echo "=== Base image info after 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/'
>
> # success, all done
> echo "*** done"
> diff --git a/tests/qemu-iotests/095.out b/tests/qemu-iotests/095.out
> index 2360061..b95111e 100644
> --- a/tests/qemu-iotests/095.out
> +++ b/tests/qemu-iotests/095.out
> @@ -1,13 +1,13 @@
> QA output created by 095
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=5242880
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=104857600
> backing_file=TEST_DIR/t.IMGFMT.base
> +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=5242880
> +Formatting 'TEST_DIR/t.IMGFMT.snp1', fmt=IMGFMT size=104857600
> backing_file=TEST_DIR/t.IMGFMT.base
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=104857600
> backing_file=TEST_DIR/t.IMGFMT.snp1
>
> === Base image info before commit and resize ===
> image: TEST_DIR/t.IMGFMT.base
> file format: IMGFMT
> virtual size: 5.0M (5242880 bytes)
> -cluster_size: 65536
> +cluster_size: XXX
>
> === Running QEMU Live Commit Test ===
>
> @@ -19,5 +19,5 @@ cluster_size: 65536
> image: TEST_DIR/t.IMGFMT.base
> file format: IMGFMT
> virtual size: 100M (104857600 bytes)
> -cluster_size: 65536
> +cluster_size: XXX
> *** done
>
signature.asc
Description: OpenPGP digital signature
- [Qemu-block] [PATCH 01/10] iotests: 018: Use TEST_IMG override instead of "mv", (continued)
- [Qemu-block] [PATCH 01/10] iotests: 018: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 02/10] iotests: 019: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 03/10] iotests: 020: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 04/10] iotests: 024: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 05/10] iotests: 028: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 06/10] iotests: 034: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 07/10] iotests: 037: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 08/10] iotests: 038: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 09/10] iotests: 050: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 10/10] iotests: 095: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- Re: [Qemu-block] [PATCH 10/10] iotests: 095: Use TEST_IMG override instead of "mv",
Max Reitz <=
- Re: [Qemu-block] [PATCH 00/10] iotests: Clean up "mv $TEST_IMG $TEST_IMG.XXX", Max Reitz, 2015/12/18