From: Maxim Levitsky <mlevitsk@redhat.com>
To: Max Reitz <mreitz@redhat.com>, qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, qemu-devel@nongnu.org
Subject: Re: [PATCH 10/18] iotests: Avoid qemu-img create
Date: Sun, 29 Sep 2019 19:33:37 +0300 [thread overview]
Message-ID: <96791fcb8157f8512a9eb8d873b540b06ccd96a7.camel@redhat.com> (raw)
In-Reply-To: <20190927094242.11152-11-mreitz@redhat.com>
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Use _make_test_img whenever possible. This way, we will not ignore
> user-specified image options.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/094 | 2 +-
> tests/qemu-iotests/111 | 3 +--
> tests/qemu-iotests/123 | 2 +-
> tests/qemu-iotests/153 | 2 +-
> tests/qemu-iotests/200 | 4 ++--
> 5 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
> index 9343e09492..d645952d54 100755
> --- a/tests/qemu-iotests/094
> +++ b/tests/qemu-iotests/094
> @@ -45,7 +45,7 @@ _supported_proto nbd
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> _make_test_img 64M
> -$QEMU_IMG create -f $IMGFMT "$TEST_DIR/source.$IMGFMT" 64M | _filter_img_create
> +TEST_IMG_FILE="$TEST_DIR/source.$IMGFMT" IMGPROTO=file _make_test_img 64M
>
> _launch_qemu -drive if=none,id=src,file="$TEST_DIR/source.$IMGFMT",format=raw \
> -nodefaults
> diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
> index 490a5bbcb5..3b43d1bd83 100755
> --- a/tests/qemu-iotests/111
> +++ b/tests/qemu-iotests/111
> @@ -41,8 +41,7 @@ _supported_fmt qed qcow qcow2 vmdk
> _supported_proto file
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> -$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
> - | _filter_testdir | _filter_imgfmt
> +_make_test_img -b "$TEST_IMG.inexistent"
>
> # success, all done
> echo '*** done'
> diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
> index d33950eb54..74d40d0478 100755
> --- a/tests/qemu-iotests/123
> +++ b/tests/qemu-iotests/123
> @@ -44,7 +44,7 @@ _supported_os Linux
> SRC_IMG="$TEST_DIR/source.$IMGFMT"
>
> _make_test_img 1M
> -$QEMU_IMG create -f $IMGFMT "$SRC_IMG" 1M | _filter_img_create
> +TEST_IMG_FILE=$SRC_IMG IMGPROTO=file _make_test_img 1M
>
> $QEMU_IO -c 'write -P 42 0 1M' "$SRC_IMG" | _filter_qemu_io
>
> diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
> index c969a1a16f..e59090259c 100755
> --- a/tests/qemu-iotests/153
> +++ b/tests/qemu-iotests/153
> @@ -98,7 +98,7 @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do
>
> echo
> echo "== Creating test image =="
> - $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" -b ${TEST_IMG}.base | _filter_img_create
> + _make_test_img -b "${TEST_IMG}.base"
>
> echo
> echo "== Launching QEMU, opts: '$opts1' =="
> diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
> index 72d431f251..d904885136 100755
> --- a/tests/qemu-iotests/200
> +++ b/tests/qemu-iotests/200
> @@ -46,8 +46,8 @@ _supported_proto file
> BACKING_IMG="${TEST_DIR}/backing.img"
> TEST_IMG="${TEST_DIR}/test.img"
>
> -${QEMU_IMG} create -f $IMGFMT "${BACKING_IMG}" 512M | _filter_img_create
> -${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b "${BACKING_IMG}" 512M | _filter_img_create
> +TEST_IMG="$BACKING_IMG" _make_test_img 512M
> +_make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M
>
> ${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io
>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
next prev parent reply other threads:[~2019-09-29 16:45 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 ` [PATCH 09/18] iotests: Drop IMGOPTS use in 267 Max Reitz
2019-09-29 16:33 ` 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 [this message]
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=96791fcb8157f8512a9eb8d873b540b06ccd96a7.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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).