On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
> tests/qemu-iotests/071 | 4 ++--
> tests/qemu-iotests/174 | 2 +-
> tests/qemu-iotests/178 | 4 ++--
> tests/qemu-iotests/197 | 4 ++--
> tests/qemu-iotests/215 | 4 ++--
> 5 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
> index fab526666b..4e31943244 100755
> --- a/tests/qemu-iotests/071
> +++ b/tests/qemu-iotests/071
> @@ -58,7 +58,7 @@ echo
> echo "=== Testing blkverify through filename ==="
> echo
>
> -TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
> +TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
> _filter_imgfmt
> _make_test_img $IMG_SIZE
> $QEMU_IO -c "open -o
> driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base $TEST_IMG" \
> @@ -73,7 +73,7 @@ echo
> echo "=== Testing blkverify through file blockref ==="
> echo
>
> -TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
> +TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
> _filter_imgfmt
> _make_test_img $IMG_SIZE
> $QEMU_IO -c "open -o
> driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base,file.test.driver=$IMGFMT,file.test.file.filename=$TEST_IMG"
> \
> diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174
> index 0a952a73fd..e2f14a38c6 100755
> --- a/tests/qemu-iotests/174
> +++ b/tests/qemu-iotests/174
> @@ -40,7 +40,7 @@ _unsupported_fmt raw
>
>
> size=256K
> -IMGFMT=raw IMGKEYSECRET= IMGOPTS= _make_test_img $size | _filter_imgfmt
> +IMGFMT=raw IMGKEYSECRET= _make_test_img --no-opts $size | _filter_imgfmt
>
> echo
> echo "== reading wrong format should fail =="
> diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
> index 21231cadd3..75b5e8f314 100755
> --- a/tests/qemu-iotests/178
> +++ b/tests/qemu-iotests/178
> @@ -62,8 +62,8 @@ $QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file
> format
>
> make_test_img_with_fmt() {
> # Shadow global variables within this function
> - local IMGFMT="$1" IMGOPTS=""
> - _make_test_img "$2"
> + local IMGFMT="$1"
> + _make_test_img --no-opts "$2"
> }
>
> qemu_io_with_fmt() {
> diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
> index 1d4f6786db..4d3d08ad6f 100755
> --- a/tests/qemu-iotests/197
> +++ b/tests/qemu-iotests/197
> @@ -66,8 +66,8 @@ if [ "$IMGFMT" = "vpc" ]; then
> fi
> _make_test_img 4G
> $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
> -IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
> - _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
> +IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
> + _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
> $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
>
> # Ensure that a read of two clusters, but where one is already allocated,
> diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
> index 2eb377d682..55a1874dcd 100755
> --- a/tests/qemu-iotests/215
> +++ b/tests/qemu-iotests/215
> @@ -63,8 +63,8 @@ if [ "$IMGFMT" = "vpc" ]; then
> fi
> _make_test_img 4G
> $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
> -IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
> - _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
> +IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
> + _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
> $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
>
> # Ensure that a read of two clusters, but where one is already allocated,
Reviewed-by: Maxim Levitsky <mlevi...@redhat.com>
