| Message ID | 20220309101626.637836-1-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/qemu-iotests: Use GNU sed in two more spots where it is necessary | expand |
On Wed, Mar 09, 2022 at 11:16:26AM +0100, Thomas Huth wrote: > These two spots have been missed in commit 9086c7639822 ("Rework the > checks and spots using GNU sed") - they need GNU sed, too, since they > are using the "+" address form. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/qemu-iotests/common.filter | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Simpler than rewriting as [0-9][0-9]* for non-GNU sed. Reviewed-by: Eric Blake <eblake@redhat.com>
On 9/3/22 11:16, Thomas Huth wrote: > These two spots have been missed in commit 9086c7639822 ("Rework the > checks and spots using GNU sed") - they need GNU sed, too, since they > are using the "+" address form. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/qemu-iotests/common.filter | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On 09.03.22 11:16, Thomas Huth wrote: > These two spots have been missed in commit 9086c7639822 ("Rework the > checks and spots using GNU sed") - they need GNU sed, too, since they > are using the "+" address form. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/qemu-iotests/common.filter | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks, applied to my block branch: https://gitlab.com/hreitz/qemu/-/commits/block Hanna
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 21819db9c3..f6e6b3bd04 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -106,13 +106,13 @@ _filter_hmp() # replace block job offset _filter_block_job_offset() { - sed -e 's/, "offset": [0-9]\+,/, "offset": OFFSET,/' + gsed -e 's/, "offset": [0-9]\+,/, "offset": OFFSET,/' } # replace block job len _filter_block_job_len() { - sed -e 's/, "len": [0-9]\+,/, "len": LEN,/g' + gsed -e 's/, "len": [0-9]\+,/, "len": LEN,/g' } # replace actual image size (depends on the host filesystem)
These two spots have been missed in commit 9086c7639822 ("Rework the checks and spots using GNU sed") - they need GNU sed, too, since they are using the "+" address form. Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/qemu-iotests/common.filter | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)