[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.0 v3 10/20] iotests/046: Avoid renaming images
From: |
Max Reitz |
Subject: |
[PATCH for-6.0 v3 10/20] iotests/046: Avoid renaming images |
Date: |
Tue, 27 Oct 2020 20:05:50 +0100 |
This generally does not work on non-file protocols. It is better to
create the image with the final name from the start, and most tests do
this already. Let 046 follow suit.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/046 | 5 +++--
tests/qemu-iotests/046.out | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index 88b3363c19..40a9f30087 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -47,6 +47,8 @@ size=128M
echo
echo "== creating backing file for COW tests =="
+TEST_IMG_SAVE=$TEST_IMG
+TEST_IMG="$TEST_IMG.base"
_make_test_img $size
backing_io()
@@ -67,8 +69,7 @@ backing_io()
backing_io 0 32 write | $QEMU_IO "$TEST_IMG" | _filter_qemu_io
-mv "$TEST_IMG" "$TEST_IMG.base"
-
+TEST_IMG=$TEST_IMG_SAVE
_make_test_img -b "$TEST_IMG.base" -F $IMGFMT 6G
echo
diff --git a/tests/qemu-iotests/046.out b/tests/qemu-iotests/046.out
index b022bcddd5..66ad987ab3 100644
--- a/tests/qemu-iotests/046.out
+++ b/tests/qemu-iotests/046.out
@@ -1,7 +1,7 @@
QA output created by 046
== creating backing file for COW tests ==
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 65536/65536 bytes at offset 65536
--
2.26.2
- [PATCH for-6.0 v3 00/20] block/export: Allow exporting BDSs via FUSE, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 02/20] fuse: Allow exporting BDSs via FUSE, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 01/20] meson: Detect libfuse, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 03/20] fuse: Implement standard FUSE operations, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 04/20] fuse: Allow growable exports, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 05/20] fuse: (Partially) implement fallocate(), Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 06/20] fuse: Implement hole detection through lseek, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 07/20] iotests: Do not needlessly filter _make_test_img, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 08/20] iotests: Do not pipe _make_test_img, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 09/20] iotests: Use convert -n in some cases, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 10/20] iotests/046: Avoid renaming images,
Max Reitz <=
- [PATCH for-6.0 v3 11/20] iotests: Derive image names from $TEST_IMG, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 13/20] iotests: Restrict some Python tests to file, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 12/20] iotests/091: Use _cleanup_qemu instad of "wait", Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 14/20] iotests: Let _make_test_img guess $TEST_IMG_FILE, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 15/20] iotests/287: Clean up subshell test image, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 16/20] storage-daemon: Call bdrv_close_all() on exit, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 17/20] iotests: Give access to the qemu-storage-daemon, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 18/20] iotests: Allow testing FUSE exports, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 19/20] iotests: Enable fuse for many tests, Max Reitz, 2020/10/27
- [PATCH for-6.0 v3 20/20] iotests/308: Add test for FUSE exports, Max Reitz, 2020/10/27