[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 09/18] iotests: Drop IMGOPTS use in 267
From: |
Maxim Levitsky |
Subject: |
Re: [PATCH 09/18] iotests: Drop IMGOPTS use in 267 |
Date: |
Sun, 29 Sep 2019 19:33:28 +0300 |
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Overwriting IMGOPTS means ignoring all user-supplied options, which is
> not what we want. Replace the current IMGOPTS use by a new BACKING_FILE
> variable.
>
> Signed-off-by: Max Reitz <address@hidden>
> ---
> tests/qemu-iotests/267 | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
> index 95f885442f..529f5f9afe 100755
> --- a/tests/qemu-iotests/267
> +++ b/tests/qemu-iotests/267
> @@ -68,7 +68,11 @@ size=128M
>
> run_test()
> {
> - _make_test_img $size
> + if [ -n "$BACKING_FILE" ]; then
> + _make_test_img -b "$BACKING_FILE" $size
> + else
> + _make_test_img $size
> + fi
> printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" |
> _filter_date
> }
>
> @@ -119,12 +123,12 @@ echo
>
> TEST_IMG="$TEST_IMG.base" _make_test_img $size
>
> -IMGOPTS="backing_file=$TEST_IMG.base" \
> +BACKING_FILE="$TEST_IMG.base" \
> run_test -blockdev
> driver=file,filename="$TEST_IMG.base",node-name=backing-file \
> -blockdev driver=file,filename="$TEST_IMG",node-name=file \
> -blockdev
> driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
>
> -IMGOPTS="backing_file=$TEST_IMG.base" \
> +BACKING_FILE="$TEST_IMG.base" \
> run_test -blockdev
> driver=file,filename="$TEST_IMG.base",node-name=backing-file \
> -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
> -blockdev driver=file,filename="$TEST_IMG",node-name=file \
> @@ -141,7 +145,7 @@ echo
> echo "=== -blockdev with NBD server on the backing file ==="
> echo
>
> -IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
> +_make_test_img -b "$TEST_IMG.base" $size
> cat <<EOF |
> nbd_server_start unix:$TEST_DIR/nbd
> nbd_server_add -w backing-fmt
qemu's master (pulled today), don't have iotest 267,
you probably based this on some not yet merged branch.
Or I made some mistake with pulling the master branch.
Best regards,
Maxim Levitsky
[PATCH 10/18] iotests: Avoid qemu-img create, Max Reitz, 2019/09/27
[PATCH 12/18] iotests: Avoid cp/mv of test images, Max Reitz, 2019/09/27
[PATCH 13/18] iotests: Make 091 work with data_file, Max Reitz, 2019/09/27