| Message ID | 20190927094242.11152-14-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | iotests: Allow ./check -o data_file | expand |
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 <mreitz@redhat.com> > --- > 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
On 29.09.19 18:34, Maxim Levitsky wrote: > 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 <mreitz@redhat.com> >> --- >> 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. Uh, nice. Will do, thanks. Max
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' 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
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 <mreitz@redhat.com> --- tests/qemu-iotests/091 | 3 ++- tests/qemu-iotests/091.out | 1 - 2 files changed, 2 insertions(+), 2 deletions(-)