From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH 09/18] iotests: Drop IMGOPTS use in 267
Date: Fri, 27 Sep 2019 11:42:33 +0200 [thread overview]
Message-ID: <20190927094242.11152-10-mreitz@redhat.com> (raw)
In-Reply-To: <20190927094242.11152-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>
---
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
--
2.21.0
next prev parent reply other threads:[~2019-09-27 9:49 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
2019-09-27 9:42 ` [PATCH 01/18] iotests: Filter refcount_order in 036 Max Reitz
2019-09-29 16:31 ` Maxim Levitsky
2019-09-30 12:43 ` Max Reitz
2019-09-30 13:40 ` Maxim Levitsky
2019-09-30 13:44 ` Max Reitz
2019-09-30 13:58 ` Maxim Levitsky
2019-09-30 14:04 ` Max Reitz
2019-09-30 14:14 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
2019-09-29 16:31 ` Maxim Levitsky
2019-09-30 12:59 ` Max Reitz
2019-09-30 14:47 ` Maxim Levitsky
2019-09-30 14:59 ` Max Reitz
2019-09-27 9:42 ` [PATCH 03/18] iotests: Drop compat=1.1 in 050 Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 04/18] iotests: Let _make_test_img parse its parameters Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 06/18] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 07/18] iotests: Replace IMGOPTS= by -o Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-30 13:00 ` Max Reitz
2019-09-30 14:30 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` Max Reitz [this message]
2019-09-29 16:33 ` [PATCH 09/18] iotests: Drop IMGOPTS use in 267 Maxim Levitsky
2019-09-30 13:01 ` Max Reitz
2019-09-30 14:32 ` Maxim Levitsky
2019-09-30 15:01 ` Max Reitz
2019-09-30 15:06 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 10/18] iotests: Avoid qemu-img create Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 11/18] iotests: Use _rm_test_img for deleting test images Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 12/18] iotests: Avoid cp/mv of " Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 13/18] iotests: Make 091 work with data_file Max Reitz
2019-09-29 16:34 ` Maxim Levitsky
2019-09-30 13:07 ` Max Reitz
2019-09-27 9:42 ` [PATCH 14/18] iotests: Make 110 " Max Reitz
2019-09-29 16:34 ` Maxim Levitsky
2019-09-30 13:34 ` Max Reitz
2019-09-30 13:41 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 15/18] iotests: Make 137 " Max Reitz
2019-09-29 16:38 ` Maxim Levitsky
2019-09-30 13:38 ` Max Reitz
2019-09-30 13:46 ` Maxim Levitsky
2019-09-30 13:57 ` Max Reitz
2019-09-30 14:06 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 16/18] iotests: Make 198 " Max Reitz
2019-09-29 16:38 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 17/18] iotests: Disable data_file where it cannot be used Max Reitz
2019-09-29 16:39 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 18/18] iotests: Allow check -o data_file Max Reitz
2019-09-29 16:39 ` Maxim Levitsky
2019-09-30 13:43 ` Max Reitz
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=20190927094242.11152-10-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--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).