From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PULL 20/34] iotests: Drop IMGOPTS use in 267
Date: Mon, 6 Jan 2020 15:41:52 +0100 [thread overview]
Message-ID: <20200106144206.698920-21-mreitz@redhat.com> (raw)
In-Reply-To: <20200106144206.698920-1-mreitz@redhat.com>
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>
---
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 b823668e29..bd9a5c5524 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -69,7 +69,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
}
@@ -120,12 +124,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 \
@@ -142,7 +146,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.24.1
next prev parent reply other threads:[~2020-01-06 14:49 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 14:41 [PULL 00/34] Block patches Max Reitz
2020-01-06 14:41 ` [PULL 01/34] block: Add bdrv_qapi_perm_to_blk_perm() Max Reitz
2020-01-06 14:41 ` [PULL 02/34] block: Use bdrv_qapi_perm_to_blk_perm() Max Reitz
2020-01-06 14:41 ` [PULL 03/34] blkdebug: Allow taking/unsharing permissions Max Reitz
2020-01-06 14:41 ` [PULL 04/34] iotests: Add @error to wait_until_completed Max Reitz
2020-01-06 14:41 ` [PULL 05/34] iotests: Add test for failing mirror complete Max Reitz
2020-01-06 14:41 ` [PULL 06/34] throttle-groups: fix memory leak in throttle_group_set_limit: Max Reitz
2020-01-06 14:41 ` [PULL 07/34] qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap Max Reitz
2020-01-06 14:41 ` [PULL 08/34] iotests: s/qocw2/qcow2/ Max Reitz
2020-01-06 14:41 ` [PULL 09/34] iotests/qcow2.py: Add dump-header-exts Max Reitz
2020-01-06 14:41 ` [PULL 10/34] iotests/qcow2.py: Split feature fields into bits Max Reitz
2020-01-06 14:41 ` [PULL 11/34] iotests: Add _filter_json_filename Max Reitz
2020-01-06 14:41 ` [PULL 12/34] iotests: Filter refcount_order in 036 Max Reitz
2020-01-06 14:41 ` [PULL 13/34] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
2020-01-06 14:41 ` [PULL 14/34] iotests: Drop compat=1.1 in 050 Max Reitz
2020-01-06 14:41 ` [PULL 15/34] iotests: Let _make_test_img parse its parameters Max Reitz
2020-01-06 14:41 ` [PULL 16/34] iotests: Add -o and --no-opts to _make_test_img Max Reitz
2020-01-06 14:41 ` [PULL 17/34] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
2020-01-06 14:41 ` [PULL 18/34] iotests: Replace IMGOPTS= by -o Max Reitz
2020-01-06 14:41 ` [PULL 19/34] iotests: Replace IMGOPTS='' by --no-opts Max Reitz
2020-01-06 14:41 ` Max Reitz [this message]
2020-01-06 14:41 ` [PULL 21/34] iotests: Avoid qemu-img create Max Reitz
2020-01-06 14:41 ` [PULL 22/34] iotests: Use _rm_test_img for deleting test images Max Reitz
2020-01-06 14:41 ` [PULL 23/34] iotests: Avoid cp/mv of " Max Reitz
2020-01-06 14:41 ` [PULL 24/34] iotests: Make 091 work with data_file Max Reitz
2020-01-06 14:41 ` [PULL 25/34] iotests: Make 110 " Max Reitz
2020-01-06 14:41 ` [PULL 26/34] iotests: Make 137 " Max Reitz
2020-01-06 14:41 ` [PULL 27/34] iotests: Make 198 " Max Reitz
2020-01-06 14:42 ` [PULL 28/34] iotests: Disable data_file where it cannot be used Max Reitz
2020-01-06 14:42 ` [PULL 29/34] iotests: Allow check -o data_file Max Reitz
2020-01-06 14:42 ` [PULL 30/34] block: introduce compress filter driver Max Reitz
2020-01-06 14:42 ` [PULL 31/34] qcow2: Allow writing compressed data of multiple clusters Max Reitz
2020-01-06 14:42 ` [PULL 32/34] tests/qemu-iotests: add case to write " Max Reitz
2020-01-06 14:42 ` [PULL 33/34] tests/qemu-iotests: Update tests to recent desugarized -accel option Max Reitz
2020-01-06 14:42 ` [PULL 34/34] backup-top: Begin drain earlier Max Reitz
2020-01-06 18:22 ` [PULL 00/34] Block patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200106144206.698920-21-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).