[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 13/22] iotests: Drop IMGOPTS use in 267
From: |
Max Reitz |
Subject: |
[PATCH v3 13/22] iotests: Drop IMGOPTS use in 267 |
Date: |
Thu, 7 Nov 2019 17:36:59 +0100 |
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>
Reviewed-by: Maxim Levitsky <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 170e173c0a..f54262a4ad 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:$SOCK_DIR/nbd
nbd_server_add -w backing-fmt
--
2.23.0
- [PATCH v3 03/22] iotests/qcow2.py: Split feature fields into bits, (continued)
- [PATCH v3 03/22] iotests/qcow2.py: Split feature fields into bits, Max Reitz, 2019/11/07
- [PATCH v3 04/22] iotests: Add _filter_json_filename, Max Reitz, 2019/11/07
- [PATCH v3 05/22] iotests: Filter refcount_order in 036, Max Reitz, 2019/11/07
- [PATCH v3 06/22] iotests: Replace IMGOPTS by _unsupported_imgopts, Max Reitz, 2019/11/07
- [PATCH v3 07/22] iotests: Drop compat=1.1 in 050, Max Reitz, 2019/11/07
- [PATCH v3 08/22] iotests: Let _make_test_img parse its parameters, Max Reitz, 2019/11/07
- [PATCH v3 09/22] iotests: Add -o and --no-opts to _make_test_img, Max Reitz, 2019/11/07
- [PATCH v3 10/22] iotests: Inject space into -ocompat=0.10 in 051, Max Reitz, 2019/11/07
- [PATCH v3 12/22] iotests: Replace IMGOPTS='' by --no-opts, Max Reitz, 2019/11/07
- [PATCH v3 14/22] iotests: Avoid qemu-img create, Max Reitz, 2019/11/07
- [PATCH v3 13/22] iotests: Drop IMGOPTS use in 267,
Max Reitz <=
- [PATCH v3 11/22] iotests: Replace IMGOPTS= by -o, Max Reitz, 2019/11/07
- [PATCH v3 16/22] iotests: Avoid cp/mv of test images, Max Reitz, 2019/11/07
- [PATCH v3 17/22] iotests: Make 091 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 15/22] iotests: Use _rm_test_img for deleting test images, Max Reitz, 2019/11/07
- [PATCH v3 18/22] iotests: Make 110 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 19/22] iotests: Make 137 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 20/22] iotests: Make 198 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 22/22] iotests: Allow check -o data_file, Max Reitz, 2019/11/07
- [PATCH v3 21/22] iotests: Disable data_file where it cannot be used, Max Reitz, 2019/11/07