[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 34/34] iotests: Make 157 actually format-agnostic
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL v2 34/34] iotests: Make 157 actually format-agnostic |
Date: |
Wed, 13 Jul 2016 14:50:41 +0200 |
From: Max Reitz <address@hidden>
iotest 157 pretends not to care about the image format used, but in fact
it does due to the format name not being filtered in its output. This
patch adds filtering and changes the reference output accordingly.
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/157 | 3 ++-
tests/qemu-iotests/157.out | 16 ++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157
index 2699168..8d939cb 100755
--- a/tests/qemu-iotests/157
+++ b/tests/qemu-iotests/157
@@ -57,7 +57,8 @@ function do_run_qemu()
function run_qemu()
{
- do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu |
_filter_generated_node_ids
+ do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_imgfmt \
+ | _filter_qemu | _filter_generated_node_ids
}
diff --git a/tests/qemu-iotests/157.out b/tests/qemu-iotests/157.out
index 5aa9c0e..77a9c03 100644
--- a/tests/qemu-iotests/157.out
+++ b/tests/qemu-iotests/157.out
@@ -3,20 +3,20 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
=== Setting WCE with qdev and with manually created BB ===
-Testing: -drive if=none,file=TEST_DIR/t.qcow2,driver=qcow2,cache=writeback
-device virtio-blk,drive=none0
+Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,driver=IMGFMT,cache=writeback
-device virtio-blk,drive=none0
Cache mode: writeback
-Testing: -drive if=none,file=TEST_DIR/t.qcow2,driver=qcow2,cache=writeback
-device virtio-blk,drive=none0,write-cache=auto
+Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,driver=IMGFMT,cache=writeback
-device virtio-blk,drive=none0,write-cache=auto
Cache mode: writeback
-Testing: -drive if=none,file=TEST_DIR/t.qcow2,driver=qcow2,cache=writeback
-device virtio-blk,drive=none0,write-cache=on
+Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,driver=IMGFMT,cache=writeback
-device virtio-blk,drive=none0,write-cache=on
Cache mode: writeback
-Testing: -drive if=none,file=TEST_DIR/t.qcow2,driver=qcow2,cache=writeback
-device virtio-blk,drive=none0,write-cache=off
+Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,driver=IMGFMT,cache=writeback
-device virtio-blk,drive=none0,write-cache=off
Cache mode: writethrough
-Testing: -drive if=none,file=TEST_DIR/t.qcow2,driver=qcow2,cache=writethrough
-device virtio-blk,drive=none0
+Testing: -drive
if=none,file=TEST_DIR/t.IMGFMT,driver=IMGFMT,cache=writethrough -device
virtio-blk,drive=none0
Cache mode: writethrough
-Testing: -drive if=none,file=TEST_DIR/t.qcow2,driver=qcow2,cache=writethrough
-device virtio-blk,drive=none0,write-cache=auto
+Testing: -drive
if=none,file=TEST_DIR/t.IMGFMT,driver=IMGFMT,cache=writethrough -device
virtio-blk,drive=none0,write-cache=auto
Cache mode: writethrough
-Testing: -drive if=none,file=TEST_DIR/t.qcow2,driver=qcow2,cache=writethrough
-device virtio-blk,drive=none0,write-cache=on
+Testing: -drive
if=none,file=TEST_DIR/t.IMGFMT,driver=IMGFMT,cache=writethrough -device
virtio-blk,drive=none0,write-cache=on
Cache mode: writeback
-Testing: -drive if=none,file=TEST_DIR/t.qcow2,driver=qcow2,cache=writethrough
-device virtio-blk,drive=none0,write-cache=off
+Testing: -drive
if=none,file=TEST_DIR/t.IMGFMT,driver=IMGFMT,cache=writethrough -device
virtio-blk,drive=none0,write-cache=off
Cache mode: writethrough
*** done
--
1.8.3.1
- [Qemu-devel] [PULL v2 24/34] qcow2: Avoid making the L1 table too big, (continued)
- [Qemu-devel] [PULL v2 24/34] qcow2: Avoid making the L1 table too big, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 28/34] vmdk: fix metadata write regression, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 22/34] block: Remove BB options from blockdev-add, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 29/34] blockdev: Fix regression with the default naming of throttling groups, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 31/34] hmp: use snapshot name to determine whether a snapshot is 'fully available', Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 30/34] qemu-iotests: Test naming of throttling groups, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 21/34] qemu-iotests: Test setting WCE with qdev, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 23/34] qemu-img: Use strerror() for generic resize error, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 27/34] Improve block job rate limiting for small bandwidth values, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 32/34] hmp: show all of snapshot info on every block dev in output of 'info snapshots', Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 34/34] iotests: Make 157 actually format-agnostic,
Kevin Wolf <=
- [Qemu-devel] [PULL v2 33/34] vvfat: Fix qcow write target driver specification, Kevin Wolf, 2016/07/13
- Re: [Qemu-devel] [PULL v2 00/34] Block layer patches, Peter Maydell, 2016/07/14