[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 13/18] iotests: Make 091 work with data_file
From: |
Maxim Levitsky |
Subject: |
Re: [PATCH 13/18] iotests: Make 091 work with data_file |
Date: |
Sun, 29 Sep 2019 19:34:05 +0300 |
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> The image end offset as reported by qemu-img check is different when
> using an external data file; we do not care about its value here, so we
> can just filter it.
>
> Signed-off-by: Max Reitz <address@hidden>
> ---
> tests/qemu-iotests/091 | 3 ++-
> tests/qemu-iotests/091.out | 1 -
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
> index f4b44659ae..7536ca4607 100755
> --- a/tests/qemu-iotests/091
> +++ b/tests/qemu-iotests/091
> @@ -101,7 +101,8 @@ echo "Check image pattern"
> ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir |
> _filter_qemu_io
>
> echo "Running 'qemu-img check -r all \$TEST_IMG'"
> -"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir |
> _filter_qemu
> +"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir |
> _filter_qemu \
> + | sed '/Image end offset/d'
Maybe use _filter_qemu_img_check instead? I see it actually filters this
already.
>
> echo "*** done"
> rm -f $seq.full
> diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out
> index 5017f8c2d9..343fac69e0 100644
> --- a/tests/qemu-iotests/091.out
> +++ b/tests/qemu-iotests/091.out
> @@ -24,5 +24,4 @@ read 4194304/4194304 bytes at offset 0
> Running 'qemu-img check -r all $TEST_IMG'
> No errors were found on the image.
> 80/16384 = 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters
> -Image end offset: 5570560
> *** done
Best regards,
Maxim Levitsky
- Re: [PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts, (continued)
- [PATCH 09/18] iotests: Drop IMGOPTS use in 267, Max Reitz, 2019/09/27
- [PATCH 10/18] iotests: Avoid qemu-img create, Max Reitz, 2019/09/27
- [PATCH 07/18] iotests: Replace IMGOPTS= by -o, Max Reitz, 2019/09/27
- [PATCH 13/18] iotests: Make 091 work with data_file, Max Reitz, 2019/09/27
- Re: [PATCH 13/18] iotests: Make 091 work with data_file,
Maxim Levitsky <=
- [PATCH 12/18] iotests: Avoid cp/mv of test images, Max Reitz, 2019/09/27
- [PATCH 14/18] iotests: Make 110 work with data_file, Max Reitz, 2019/09/27
- [PATCH 11/18] iotests: Use _rm_test_img for deleting test images, Max Reitz, 2019/09/27
- [PATCH 15/18] iotests: Make 137 work with data_file, Max Reitz, 2019/09/27