qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Fam Zheng <famz@redhat.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL 07/21] iotests: 020: Use TEST_IMG override instead of "mv"
Date: Thu,  7 Jan 2016 23:57:21 +0100	[thread overview]
Message-ID: <1452207455-10806-8-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1452207455-10806-1-git-send-email-mreitz@redhat.com>

From: Fam Zheng <famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1450752561-9300-4-git-send-email-famz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/020     | 7 +++++--
 tests/qemu-iotests/020.out | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 2f258dc..6625b55 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -56,6 +56,9 @@ fi
 
 TEST_OFFSETS="0 4294967296"
 
+TEST_IMG_SAVE="$TEST_IMG"
+TEST_IMG="$TEST_IMG.base"
+
 _make_test_img 6G
 
 echo "Filling base image"
@@ -73,7 +76,7 @@ _check_test_img
 echo "Creating test image with backing file"
 echo
 
-mv "$TEST_IMG" "$TEST_IMG.base"
+TEST_IMG="$TEST_IMG_SAVE"
 _make_test_img -b "$TEST_IMG.base" 6G
 
 echo "Filling test image"
@@ -89,7 +92,7 @@ done
 _check_test_img
 
 $QEMU_IMG commit "$TEST_IMG"
-mv "$TEST_IMG.base" "$TEST_IMG"
+TEST_IMG="$TEST_IMG.base"
 
 echo "Reading from the backing file"
 echo
diff --git a/tests/qemu-iotests/020.out b/tests/qemu-iotests/020.out
index 134aa29..42f6c1b 100644
--- a/tests/qemu-iotests/020.out
+++ b/tests/qemu-iotests/020.out
@@ -1,5 +1,5 @@
 QA output created by 020
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
 Filling base image
 
 === IO: pattern 0
-- 
2.6.4

  parent reply	other threads:[~2016-01-07 22:58 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-07 22:57 [Qemu-devel] [PULL 00/21] Block layer patches Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 01/21] iotests: 086: Add raw format Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 02/21] qemu-iotests: make check-block.sh work on out-of-tree builds Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 03/21] block: use drained section in bdrv_close Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 04/21] block/qapi: Clear err for further error Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 05/21] iotests: 018: Use TEST_IMG override instead of "mv" Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 06/21] iotests: 019: " Max Reitz
2016-01-07 22:57 ` Max Reitz [this message]
2016-01-07 22:57 ` [Qemu-devel] [PULL 08/21] iotests: 024: " Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 09/21] iotests: 028: " Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 10/21] iotests: 034: " Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 11/21] iotests: 037: " Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 12/21] iotests: 038: " Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 13/21] iotests: 050: " Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 14/21] iotests: 095: " Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 15/21] iotests: 095: Filter _img_info output Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 16/21] qemu-iotests: s390x: fix test 051 Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 17/21] block: Rename BLOCK_OP_TYPE_MIRROR to BLOCK_OP_TYPE_MIRROR_SOURCE Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 18/21] block: Extract blockdev part of qmp_drive_mirror Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 19/21] block: Add check on mirror target Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 20/21] qmp: Add blockdev-mirror command Max Reitz
2016-01-07 22:57 ` [Qemu-devel] [PULL 21/21] iotests: Add test cases for blockdev-mirror Max Reitz
2016-01-08 11:24 ` [Qemu-devel] [PULL 00/21] Block layer 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=1452207455-10806-8-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=famz@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).