[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 12/21] iotests: Drop IMGOPTS use in 267
From: |
Max Reitz |
Subject: |
[PATCH v2 12/21] iotests: Drop IMGOPTS use in 267 |
Date: |
Tue, 15 Oct 2019 16:27:20 +0200 |
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 d37a67c012..eda45449d4 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
--
2.21.0
- [PATCH v2 00/21] iotests: Allow ./check -o data_file, Max Reitz, 2019/10/15
- [PATCH v2 01/21] iotests/qcow2.py: Add dump-header-exts, Max Reitz, 2019/10/15
- [PATCH v2 03/21] iotests: Add _filter_json_filename, Max Reitz, 2019/10/15
- [PATCH v2 02/21] iotests/qcow2.py: Split feature fields into bits, Max Reitz, 2019/10/15
- [PATCH v2 04/21] iotests: Filter refcount_order in 036, Max Reitz, 2019/10/15
- [PATCH v2 05/21] iotests: Replace IMGOPTS by _unsupported_imgopts, Max Reitz, 2019/10/15
- [PATCH v2 06/21] iotests: Drop compat=1.1 in 050, Max Reitz, 2019/10/15
- [PATCH v2 07/21] iotests: Let _make_test_img parse its parameters, Max Reitz, 2019/10/15
- [PATCH v2 08/21] iotests: Add -o and --no-opts to _make_test_img, Max Reitz, 2019/10/15
- [PATCH v2 09/21] iotests: Inject space into -ocompat=0.10 in 051, Max Reitz, 2019/10/15
- [PATCH v2 12/21] iotests: Drop IMGOPTS use in 267,
Max Reitz <=
- [PATCH v2 11/21] iotests: Replace IMGOPTS='' by --no-opts, Max Reitz, 2019/10/15
- [PATCH v2 13/21] iotests: Avoid qemu-img create, Max Reitz, 2019/10/15
- [PATCH v2 10/21] iotests: Replace IMGOPTS= by -o, Max Reitz, 2019/10/15
- [PATCH v2 15/21] iotests: Avoid cp/mv of test images, Max Reitz, 2019/10/15
- [PATCH v2 14/21] iotests: Use _rm_test_img for deleting test images, Max Reitz, 2019/10/15
- [PATCH v2 16/21] iotests: Make 091 work with data_file, Max Reitz, 2019/10/15
- [PATCH v2 17/21] iotests: Make 110 work with data_file, Max Reitz, 2019/10/15
- [PATCH v2 18/21] iotests: Make 137 work with data_file, Max Reitz, 2019/10/15
- [PATCH v2 19/21] iotests: Make 198 work with data_file, Max Reitz, 2019/10/15
- [PATCH v2 21/21] iotests: Allow check -o data_file, Max Reitz, 2019/10/15