From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
jcody@redhat.com, jsnow@redhat.com, qemu-block@nongnu.org,
mreitz@redhat.com
Subject: [Qemu-devel] [PATCH 01/10] iotests: 018: Use TEST_IMG override instead of "mv"
Date: Wed, 16 Dec 2015 17:54:44 +0800 [thread overview]
Message-ID: <1450259693-25595-2-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1450259693-25595-1-git-send-email-famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/qemu-iotests/018 | 8 ++++----
tests/qemu-iotests/018.out | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index d8a7d43..07b2de9 100755
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -66,8 +66,8 @@ _check_test_img
echo "Creating test image with backing file"
echo
-TEST_IMG=$TEST_IMG_SAVE
-_make_test_img -b "$TEST_IMG.base" 6G
+TEST_IMG="$TEST_IMG_SAVE.orig"
+_make_test_img -b "$TEST_IMG_SAVE.base" 6G
echo "Filling test image"
echo
@@ -81,8 +81,8 @@ for offset in $TEST_OFFSETS; do
done
_check_test_img
-mv "$TEST_IMG" "$TEST_IMG.orig"
-$QEMU_IMG convert -O $IMGFMT "$TEST_IMG.orig" "$TEST_IMG"
+TEST_IMG="$TEST_IMG_SAVE"
+$QEMU_IMG convert -f $IMGFMT -O $IMGFMT "$TEST_IMG.orig" "$TEST_IMG"
echo "Reading"
echo
diff --git a/tests/qemu-iotests/018.out b/tests/qemu-iotests/018.out
index d66bd63..5df9667 100644
--- a/tests/qemu-iotests/018.out
+++ b/tests/qemu-iotests/018.out
@@ -269,7 +269,7 @@ wrote 65536/65536 bytes at offset 4295032832
No errors were found on the image.
Creating test image with backing file
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base
+Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base
Filling test image
=== IO: pattern 1
--
2.4.3
next prev parent reply other threads:[~2015-12-16 9:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-16 9:54 [Qemu-devel] [PATCH 00/10] iotests: Clean up "mv $TEST_IMG $TEST_IMG.XXX" Fam Zheng
2015-12-16 9:54 ` Fam Zheng [this message]
2015-12-16 9:54 ` [Qemu-devel] [PATCH 02/10] iotests: 019: Use TEST_IMG override instead of "mv" Fam Zheng
2015-12-16 9:54 ` [Qemu-devel] [PATCH 03/10] iotests: 020: " Fam Zheng
2015-12-16 9:54 ` [Qemu-devel] [PATCH 04/10] iotests: 024: " Fam Zheng
2015-12-16 9:54 ` [Qemu-devel] [PATCH 05/10] iotests: 028: " Fam Zheng
2015-12-16 9:54 ` [Qemu-devel] [PATCH 06/10] iotests: 034: " Fam Zheng
2015-12-16 9:54 ` [Qemu-devel] [PATCH 07/10] iotests: 037: " Fam Zheng
2015-12-16 9:54 ` [Qemu-devel] [PATCH 08/10] iotests: 038: " Fam Zheng
2015-12-16 9:54 ` [Qemu-devel] [PATCH 09/10] iotests: 050: " Fam Zheng
2015-12-16 9:54 ` [Qemu-devel] [PATCH 10/10] iotests: 095: " Fam Zheng
2015-12-18 18:18 ` Max Reitz
2015-12-22 2:36 ` Fam Zheng
2015-12-18 18:18 ` [Qemu-devel] [PATCH 00/10] iotests: Clean up "mv $TEST_IMG $TEST_IMG.XXX" 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=1450259693-25595-2-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=jcody@redhat.com \
--cc=jsnow@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.