On 01/25/2016 11:41 AM, Max Reitz wrote: > The NBD log lines ("/your/source/dir/nbd.c:function():line: error")
This line doesn't match the pre- or post-patch sed pattern. Something that would match would be "/your/source/dir/nbd/file.c:function():line: error". Maybe you should tweak the commit message? > should not be converted to empty lines but removed altogether. > > Signed-off-by: Max Reitz <mre...@redhat.com> > --- > tests/qemu-iotests/083.out | 10 ---------- > tests/qemu-iotests/common.filter | 2 +- > 2 files changed, 1 insertion(+), 11 deletions(-) > +++ b/tests/qemu-iotests/common.filter > @@ -237,7 +237,7 @@ _filter_nbd() > # receive callbacks sometimes, making them unreliable. > # > # Filter out the TCP port number since this changes between runs. > - sed -e 's#^.*nbd/.*\.c:.*##g' \ > + sed -e '/nbd\/.*\.c:/d' \ The filter may be over-broad,... > -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \ ...given that this line will be useless if anything in the resulting message contains '.c'. A tighter filter might be worth it (maybe '^[!:]*nbd\/[!:]*\.c:/d', to at least limit it to lines where "nbd/...c:" appears at the front of the line? But that's a separate change. Your conversion looks sane by itself, so: Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature