[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/21] iotests: 018: Use TEST_IMG override instead of
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 05/21] iotests: 018: Use TEST_IMG override instead of "mv" |
Date: |
Thu, 7 Jan 2016 23:57:19 +0100 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
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.6.4
- [Qemu-devel] [PULL 00/21] Block layer patches, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 01/21] iotests: 086: Add raw format, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 02/21] qemu-iotests: make check-block.sh work on out-of-tree builds, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 03/21] block: use drained section in bdrv_close, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 04/21] block/qapi: Clear err for further error, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 05/21] iotests: 018: Use TEST_IMG override instead of "mv",
Max Reitz <=
- [Qemu-devel] [PULL 06/21] iotests: 019: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 07/21] iotests: 020: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 08/21] iotests: 024: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 10/21] iotests: 034: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 11/21] iotests: 037: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 09/21] iotests: 028: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 12/21] iotests: 038: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 13/21] iotests: 050: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 14/21] iotests: 095: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 15/21] iotests: 095: Filter _img_info output, Max Reitz, 2016/01/07