On Fri, Aug 01, 2025 at 04:59:50PM +0200, Martin Kletzander wrote:
> From: Martin Kletzander <mklet...@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 ?
>
> Signed-off-by: Martin Kletzander <mklet...@redhat.com>
> ---
> tests/qemu-iotests/039.out | 10 +++++-----
> tests/qemu-iotests/061.out | 4 ++--
> tests/qemu-iotests/137.out | 2 +-
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
> index e52484d4be1b..87809c534ba3 100644
> --- a/tests/qemu-iotests/039.out
> +++ b/tests/qemu-iotests/039.out
> @@ -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 to the image may
> corrupt it.
> 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
> diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
> index 24c33add7ce6..ae4c0d37bbbe 100644
> --- a/tests/qemu-iotests/061.out
> +++ b/tests/qemu-iotests/061.out
> @@ -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
> diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
> index 86377c80cde6..f3b12fbb04b0 100644
> --- a/tests/qemu-iotests/137.out
> +++ b/tests/qemu-iotests/137.out
> @@ -35,7 +35,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> 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'
> --
> 2.50.1
>
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
