[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 01/10] iotests: 018: Use TEST_IMG override instead o
|
From: |
Fam Zheng |
|
Subject: |
[Qemu-block] [PATCH 01/10] iotests: 018: Use TEST_IMG override instead of "mv" |
|
Date: |
Wed, 16 Dec 2015 17:54:44 +0800 |
Signed-off-by: Fam Zheng <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.4.3
- [Qemu-block] [PATCH 00/10] iotests: Clean up "mv $TEST_IMG $TEST_IMG.XXX", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 01/10] iotests: 018: Use TEST_IMG override instead of "mv",
Fam Zheng <=
- [Qemu-block] [PATCH 02/10] iotests: 019: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 03/10] iotests: 020: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 04/10] iotests: 024: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 05/10] iotests: 028: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 06/10] iotests: 034: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 07/10] iotests: 037: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 08/10] iotests: 038: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 09/10] iotests: 050: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16
- [Qemu-block] [PATCH 10/10] iotests: 095: Use TEST_IMG override instead of "mv", Fam Zheng, 2015/12/16