mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests: Drop IMGOPTS use in 267

Browse Source 
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 <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-14-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2019-11-07 17:36:59 +01:00
parent 10b612565c
commit ecb4c1d116
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/qemu-iotests/267
View File

@ -69,7 +69,11 @@ size=128M
run_test() 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 printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
} }
@ -120,12 +124,12 @@ echo
TEST_IMG="$TEST_IMG.base" _make_test_img $size 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 \ run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
-blockdev driver=file,filename="$TEST_IMG",node-name=file \ -blockdev driver=file,filename="$TEST_IMG",node-name=file \
-blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt -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 \ 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=$IMGFMT,file=backing-file,node-name=backing-fmt \
-blockdev driver=file,filename="$TEST_IMG",node-name=file \ -blockdev driver=file,filename="$TEST_IMG",node-name=file \
@ -142,7 +146,7 @@ echo
echo "=== -blockdev with NBD server on the backing file ===" echo "=== -blockdev with NBD server on the backing file ==="
echo echo
IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size _make_test_img -b "$TEST_IMG.base" $size
cat <<EOF | cat <<EOF |
nbd_server_start unix:$SOCK_DIR/nbd nbd_server_start unix:$SOCK_DIR/nbd
nbd_server_add -w backing-fmt nbd_server_add -w backing-fmt