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 12/18] iotests: Avoid cp/mv of test images
Date: Sun, 29 Sep 2019 19:33:56 +0300 [thread overview]
Message-ID: <79526395923f4a9ffc0eced407fe316dc38898dd.camel@redhat.com> (raw)
In-Reply-To: <20190927094242.11152-13-mreitz@redhat.com>
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> This will not work with external data files, so try to get tests working
> without it as far as possible.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/063 | 12 ++++--------
> tests/qemu-iotests/063.out | 3 ++-
> tests/qemu-iotests/085 | 9 +++------
> tests/qemu-iotests/085.out | 8 ++++----
> 4 files changed, 13 insertions(+), 19 deletions(-)
>
> diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
> index eef2b8a534..c750b3806e 100755
> --- a/tests/qemu-iotests/063
> +++ b/tests/qemu-iotests/063
> @@ -51,15 +51,13 @@ _unsupported_imgopts "subformat=monolithicFlat" \
> _make_test_img 4M
>
> echo "== Testing conversion with -n fails with no target file =="
> -# check .orig file does not exist
> -rm -f "$TEST_IMG.orig"
> if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then
> exit 1
> fi
>
> echo "== Testing conversion with -n succeeds with a target file =="
> -rm -f "$TEST_IMG.orig"
> -cp "$TEST_IMG" "$TEST_IMG.orig"
> +_rm_test_img "$TEST_IMG.orig"
> +TEST_IMG="$TEST_IMG.orig" _make_test_img 4M
> if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then
> exit 1
> fi
> @@ -85,10 +83,8 @@ fi
> _check_test_img
>
> echo "== Testing conversion to a smaller file fails =="
> -rm -f "$TEST_IMG.orig"
> -mv "$TEST_IMG" "$TEST_IMG.orig"
> -_make_test_img 2M
> -if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then
> +TEST_IMG="$TEST_IMG.target" _make_test_img 2M
> +if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then
> exit 1
> fi
>
> diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
> index 7b691b2c9e..890b719bf0 100644
> --- a/tests/qemu-iotests/063.out
> +++ b/tests/qemu-iotests/063.out
> @@ -2,11 +2,12 @@ QA output created by 063
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
> == Testing conversion with -n fails with no target file ==
> == Testing conversion with -n succeeds with a target file ==
> +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304
> == Testing conversion to raw is the same after conversion with -n ==
> == Testing conversion back to original format ==
> No errors were found on the image.
> == Testing conversion to a smaller file fails ==
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
> +Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152
> == Regression testing for copy offloading bug ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
> Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
> diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
> index bbea1252d2..46981dbb64 100755
> --- a/tests/qemu-iotests/085
> +++ b/tests/qemu-iotests/085
> @@ -105,8 +105,7 @@ add_snapshot_image()
> {
> base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}"
> snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}"
> - _make_test_img -u -b "${base_image}" "$size"
> - mv "${TEST_IMG}" "${snapshot_file}"
> + TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size"
> do_blockdev_add "$1" "'backing': null, " "${snapshot_file}"
> }
>
> @@ -122,10 +121,8 @@ blockdev_snapshot()
>
> size=128M
>
> -_make_test_img $size
> -mv "${TEST_IMG}" "${TEST_IMG}.1"
> -_make_test_img $size
> -mv "${TEST_IMG}" "${TEST_IMG}.2"
> +TEST_IMG="$TEST_IMG.1" _make_test_img $size
> +TEST_IMG="$TEST_IMG.2" _make_test_img $size
>
> echo
> echo === Running QEMU ===
> diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
> index 2a5f256cd3..313198f182 100644
> --- a/tests/qemu-iotests/085.out
> +++ b/tests/qemu-iotests/085.out
> @@ -1,6 +1,6 @@
> QA output created by 085
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> +Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728
> +Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728
>
> === Running QEMU ===
>
> @@ -55,10 +55,10 @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil
>
> === Create a couple of snapshots using blockdev-snapshot ===
>
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
> +Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
> {"return": {}}
> {"return": {}}
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
> +Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
> {"return": {}}
> {"return": {}}
>
Looks good.
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
next prev parent reply other threads:[~2019-09-29 16:40 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
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 [this message]
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=79526395923f4a9ffc0eced407fe316dc38898dd.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).