Re: [PATCH 2/2] tests/qemu-iotests: Indent expected error messages

[Kevin Wolf <kwolf@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 3197 bytes --]

Am 11.08.2025 um 11:05 hat Martin Kletzander geschrieben:
> On Wed, Aug 06, 2025 at 08:54:51AM +0200, Dr. Werner Fink wrote:
> > On 2025/08/04 13:33:53 +0200, Kevin Wolf wrote:
> > > Am 01.08.2025 um 21:09 hat Fabiano Rosas geschrieben:
> > > > Daniel P. Berrangé <berrange@redhat.com> writes:
> > > >
> > > > > On Fri, Aug 01, 2025 at 04:59:50PM +0200, Martin Kletzander wrote:
> > > > >> From: Martin Kletzander <mkletzan@redhat.com>
> > > > >>
> > > > >> When running all tests the expected "killed" messages are indented
> > > > >> differently than the actual ones, by three more spaces.  Change it so
> > > > >> that the messages match and tests pass.
> > > > >
> > > > > This would break the tests on my system and CI too.
> > > > >
> > > > > What distro are you seeing this on ?
> > > > >
> > > > > I'm guessing this is a different in either valgrind or C library ?
> > > >
> > > > It's bash, we have an open issue about it:
> > > >
> > > > https://gitlab.com/qemu-project/qemu/-/issues/3050
> > > 
> > > I see a patch has been posted to that bug, the most important part of
> > > which is this added filtering:
> > > 
> > > --- a/tests/qemu-iotests/common.filter
> > > +++ b/tests/qemu-iotests/common.filter  2025-07-25 11:39:22.419665788 +0000
> > > @@ -75,7 +75,7 @@ _filter_qemu_io()
> > >      _filter_win32 | \
> > >      gsed -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.inf]* [EPTGMKiBbytes]*\/sec and [0-9/.inf]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" \
> > >          -e "s/: line [0-9][0-9]*:  *[0-9][0-9]*\( Aborted\| Killed\)/:\1/" \
> > > -        -e "s/qemu-io> //g"
> > > +        -e "s/qemu-io> //g" -e '/Killed/{ s/ \{2,\}/ /}'
> > >  }
> > > 
> > >  # replace occurrences of QEMU_PROG with "qemu"
> > > 
> > > This approach makes sense to me, though I would have kept each sed
> > > expression on a separate line.
> > > 
> > > And given that the context line above includes "Aborted" as well, maybe
> > > have it here, too, though none of the actual test outputs have an
> > > Aborted message any more since commit 3f39447. Or we could have a
> > > cleanup patch first that removes the unused "Abort" above, just to keep
> > > things consistent.
> > > 
> > > Either way, please post this as a proper patch on the mailing list.
> > 
> > Just next try in tha attached patch with a fixed version of
> > the sed command.
> > 
> > Werner
> > 
> > -- 
> >  "Having a smoking section in a restaurant is like having
> >          a peeing section in a swimming pool." -- Edward Burr
> 
> > From: Werner Fink <werner@suse.de>
> > Date: Fri, 08 Aug 06:41:23 +0000
> > Subject: [PATCH 1/1] Avoid dependency on padding on signal messages
> > 
> > New bash 5.3 uses a different padding for reporting job status.
> > 
> > Resolves: boo#1246830
> 
> Not sure you meant that or
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3050

I just updated the commit message to contain both.

> > Signed-off-by: Werner Fink <werner@suse.de>
> 
> but, FWIW, if that makes any difference,
> 
> Tested-by: Martin Kletzander <mkletzan@redhat.com>

Thanks, applied to the block branch.

Kevin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]