[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/18] iotests: Derive image names from $TEST_IMG
From: |
Max Reitz |
Subject: |
[PATCH 12/18] iotests: Derive image names from $TEST_IMG |
Date: |
Thu, 19 Dec 2019 15:38:12 +0100 |
Avoid creating images with custom filenames in $TEST_DIR, because
non-file protocols may want to keep $TEST_IMG (and all other test
images) in some other directory.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/200 | 3 +--
tests/qemu-iotests/200.out | 4 ++--
tests/qemu-iotests/229 | 3 +--
tests/qemu-iotests/229.out | 6 +++---
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index a2cdd7f83d..616b632a86 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -44,8 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto file
-BACKING_IMG="${TEST_DIR}/backing.img"
-TEST_IMG="${TEST_DIR}/test.img"
+BACKING_IMG="$TEST_IMG.base"
TEST_IMG="$BACKING_IMG" _make_test_img 512M
_make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M
diff --git a/tests/qemu-iotests/200.out b/tests/qemu-iotests/200.out
index a6776070e4..5883f16ac3 100644
--- a/tests/qemu-iotests/200.out
+++ b/tests/qemu-iotests/200.out
@@ -1,6 +1,6 @@
QA output created by 200
-Formatting 'TEST_DIR/backing.img', fmt=IMGFMT size=536870912
-Formatting 'TEST_DIR/test.img', fmt=IMGFMT size=536870912
backing_file=TEST_DIR/backing.img backing_fmt=IMGFMT
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=536870912
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=536870912
backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT
wrote 314572800/314572800 bytes at offset 512
300 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index 866168b236..abc88f881f 100755
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229
@@ -47,8 +47,7 @@ _supported_proto file
_supported_os Linux
-DEST_IMG="$TEST_DIR/d.$IMGFMT"
-TEST_IMG="$TEST_DIR/b.$IMGFMT"
+DEST_IMG="$TEST_IMG.dest"
_make_test_img 2M
diff --git a/tests/qemu-iotests/229.out b/tests/qemu-iotests/229.out
index 22350d75d7..ef96b85062 100644
--- a/tests/qemu-iotests/229.out
+++ b/tests/qemu-iotests/229.out
@@ -1,6 +1,6 @@
QA output created by 229
-Formatting 'TEST_DIR/b.IMGFMT', fmt=IMGFMT size=2097152
-Formatting 'TEST_DIR/d.IMGFMT', fmt=IMGFMT size=1048576
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+Formatting 'TEST_DIR/t.IMGFMT.dest', fmt=IMGFMT size=1048576
wrote 2097152/2097152 bytes at offset 0
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
{'execute': 'qmp_capabilities'}
@@ -8,7 +8,7 @@ wrote 2097152/2097152 bytes at offset 0
=== Starting drive-mirror, causing error & stop ===
-{'execute': 'drive-mirror', 'arguments': {'device': 'testdisk', 'format':
'IMGFMT', 'target': 'TEST_DIR/d.IMGFMT', 'sync': 'full', 'mode': 'existing',
'on-source-error': 'stop', 'on-target-error': 'stop' }}
+{'execute': 'drive-mirror', 'arguments': {'device': 'testdisk', 'format':
'IMGFMT', 'target': 'TEST_DIR/t.IMGFMT.dest', 'sync': 'full', 'mode':
'existing', 'on-source-error': 'stop', 'on-target-error': 'stop' }}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"JOB_STATUS_CHANGE", "data": {"status": "created", "id": "testdisk"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"JOB_STATUS_CHANGE", "data": {"status": "running", "id": "testdisk"}}
{"return": {}}
--
2.23.0
- Re: [PATCH 02/18] fuse: Allow exporting BDSs via FUSE, (continued)
- [PATCH 03/18] fuse: Implement standard FUSE operations, Max Reitz, 2019/12/19
- [PATCH 04/18] fuse: Add fuse-export-remove, Max Reitz, 2019/12/19
- [PATCH 05/18] fuse: Allow growable exports, Max Reitz, 2019/12/19
- [PATCH 06/18] fuse: (Partially) implement fallocate(), Max Reitz, 2019/12/19
- [PATCH 07/18] fuse: Implement hole detection through lseek, Max Reitz, 2019/12/19
- [PATCH 08/18] iotests: Do not needlessly filter _make_test_img, Max Reitz, 2019/12/19
- [PATCH 09/18] iotests: Do not pipe _make_test_img, Max Reitz, 2019/12/19
- [PATCH 10/18] iotests: Use convert -n in some cases, Max Reitz, 2019/12/19
- [PATCH 11/18] iotests: Avoid renaming images, Max Reitz, 2019/12/19
- [PATCH 12/18] iotests: Derive image names from $TEST_IMG,
Max Reitz <=
- [PATCH 13/18] iotests/091: Use _cleanup_qemu instad of "wait", Max Reitz, 2019/12/19
- [PATCH 14/18] iotests: Restrict some Python tests to file, Max Reitz, 2019/12/19
- [PATCH 15/18] iotests: Let _make_test_img guess $TEST_IMG_FILE, Max Reitz, 2019/12/19
- [PATCH 16/18] iotests: Allow testing FUSE exports, Max Reitz, 2019/12/19
- [PATCH 17/18] iotests: Enable fuse for many tests, Max Reitz, 2019/12/19
- [PATCH 18/18] iotests/281: Add test for FUSE exports, Max Reitz, 2019/12/19
- Re: [PATCH 00/18] block: Allow exporting BDSs via FUSE, Max Reitz, 2019/12/19
- Re: [PATCH 00/18] block: Allow exporting BDSs via FUSE, Stefan Hajnoczi, 2019/12/20