On Tue, 2019-10-15 at 16:27 +0200, Max Reitz wrote:
> We do not care about the json:{} filenames here, so we can just filter
> them out and thus make the test work both with and without external data
> files.
>
> Signed-off-by: Max Reitz
> ---
> tests/qemu-iotests/198 | 6 --
> tests/qemu-iotests/198.out | 4 ++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
> index c8f824cfae..fb0d5a29d3 100755
> --- a/tests/qemu-iotests/198
> +++ b/tests/qemu-iotests/198
> @@ -92,13 +92,15 @@ echo
> echo "== checking image base =="
> $QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info
> --format-specific \
> | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
> - -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
> + -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
> +| _filter_json_filename
>
> echo
> echo "== checking image layer =="
> $QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info
> --format-specific \
> | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
> - -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
> + -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
> +| _filter_json_filename
>
>
> # success, all done
> diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
> index e86b175e39..831ce3a289 100644
> --- a/tests/qemu-iotests/198.out
> +++ b/tests/qemu-iotests/198.out
> @@ -32,7 +32,7 @@ read 16777216/16777216 bytes at offset 0
> 16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == checking image base ==
> -image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file":
> {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
> +image: json:{ /* filtered */ }
> file format: IMGFMT
> virtual size: 16 MiB (16777216 bytes)
> Format specific information:
> @@ -74,7 +74,7 @@ Format specific information:
> master key iters: 1024
>
> == checking image layer ==
> -image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file":
> {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
> +image: json:{ /* filtered */ }
> file format: IMGFMT
> virtual size: 16 MiB (16777216 bytes)
> backing file: TEST_DIR/t.IMGFMT.base
Reviewed-by: Maxim Levitsky
Best regards,
Maxim Levitsky
