Re: [Qemu-block] [PATCH] iotests: Make 157 actually format-agnostic

[John Snow]

On 07/11/2016 09:22 AM, Max Reitz wrote:
> 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>
> ---
>  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
> 

http://i.imgur.com/WH2XBUG.jpg

Reviewed-by: John Snow <address@hidden>