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

[Martin Kletzander <mkletzan@redhat.com>]

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

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

>Signed-off-by: Werner Fink <werner@suse.de>

but, FWIW, if that makes any difference,

Tested-by: Martin Kletzander <mkletzan@redhat.com>

>---
> tests/qemu-iotests/039.out       |   10 +++++-----
> tests/qemu-iotests/061.out       |    4 ++--
> tests/qemu-iotests/137.out       |    2 +-
> tests/qemu-iotests/common.filter |    2 +-
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
>--- a/tests/qemu-iotests/039.out
>+++ b/tests/qemu-iotests/039.out	2025-07-25 11:36:51.949026116 +0000
>@@ -11,7 +11,7 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>-./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
>+./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
> incompatible_features     [0]
> ERROR cluster 5 refcount=0 reference=1
> ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
>@@ -46,7 +46,7 @@ read 512/512 bytes at offset 0
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>-./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
>+./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
> incompatible_features     [0]
> ERROR cluster 5 refcount=0 reference=1
> Rebuilding refcount structure
>@@ -60,7 +60,7 @@ incompatible_features     []
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>-./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
>+./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
> incompatible_features     []
> No errors were found on the image.
> 
>@@ -79,7 +79,7 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>-./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
>+./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
> incompatible_features     [0]
> ERROR cluster 5 refcount=0 reference=1
> ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
>@@ -89,7 +89,7 @@ Data may be corrupted, or further writes
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>-./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
>+./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
> incompatible_features     []
> No errors were found on the image.
> *** done
>--- a/tests/qemu-iotests/061.out
>+++ b/tests/qemu-iotests/061.out	2025-07-25 11:36:51.949026116 +0000
>@@ -118,7 +118,7 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> wrote 131072/131072 bytes at offset 0
> 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>-./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
>+./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
> magic                     0x514649fb
> version                   3
> backing_file_offset       0x0
>@@ -304,7 +304,7 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> wrote 131072/131072 bytes at offset 0
> 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>-./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
>+./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
> magic                     0x514649fb
> version                   3
> backing_file_offset       0x0
>--- a/tests/qemu-iotests/137.out
>+++ b/tests/qemu-iotests/137.out	2025-07-25 11:36:51.949026116 +0000
>@@ -35,7 +35,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGF
> qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>-./common.rc: Killed                  ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
>+./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
> OK: Dirty bit not set
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
>--- a/tests/qemu-iotests/common.filter
>+++ b/tests/qemu-iotests/common.filter	2025-08-06 06:41:23.649980764 +0000
>@@ -74,7 +74,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/: line [0-9][0-9]*:  *[0-9][0-9]*\( Aborted\| Killed\) \{2,\}/:\1 /" \
>         -e "s/qemu-io> //g"
> }
> 




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