From 4c36f030638e121872386cd1d3725e745a30d943 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Tue, 27 Oct 2020 20:05:51 +0100 Subject: [PATCH] iotests: Derive image names from $TEST_IMG 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 Reviewed-by: Kevin Wolf Message-Id: <20201027190600.192171-12-mreitz@redhat.com> Signed-off-by: Kevin Wolf --- 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 59f7854b9f..a7aabbd032 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 89a5359f32..5f759fa587 100755 --- a/tests/qemu-iotests/229 +++ b/tests/qemu-iotests/229 @@ -51,8 +51,7 @@ _supported_os Linux _unsupported_imgopts data_file -DEST_IMG="$TEST_DIR/d.$IMGFMT" -TEST_IMG="$TEST_DIR/b.$IMGFMT" +DEST_IMG="$TEST_IMG.dest" BLKDEBUG_CONF="$TEST_DIR/blkdebug.conf" _make_test_img 2M diff --git a/tests/qemu-iotests/229.out b/tests/qemu-iotests/229.out index 4de6dfaa28..7eed393013 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=2097152 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 +Formatting 'TEST_DIR/t.IMGFMT.dest', fmt=IMGFMT size=2097152 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': 'blkdebug:TEST_DIR/blkdebug.conf: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': 'blkdebug:TEST_DIR/blkdebug.conf: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": {}}