[v1] iotests: Allow ./check -o data_file

[PATCH 03/18] iotests: Drop compat=1.1 in 050

Posted by Max Reitz 6 years, 1 month ago

IMGOPTS can never be empty for qcow2, because the check scripts adds
compat=1.1 unless the user specified any compat option themselves.
Thus, this block does not do anything and can be dropped.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/050 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index 211fc00797..272ecab195 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -41,10 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2 qed
 _supported_proto file
 
-if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
-  IMGOPTS=compat=1.1
-fi
-
 echo
 echo "== Creating images =="
 
-- 
2.21.0

Re: [PATCH 03/18] iotests: Drop compat=1.1 in 050

Posted by Maxim Levitsky 6 years, 1 month ago

On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> IMGOPTS can never be empty for qcow2, because the check scripts adds
> compat=1.1 unless the user specified any compat option themselves.
> Thus, this block does not do anything and can be dropped.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/050 | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
> index 211fc00797..272ecab195 100755
> --- a/tests/qemu-iotests/050
> +++ b/tests/qemu-iotests/050
> @@ -41,10 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>  _supported_fmt qcow2 qed
>  _supported_proto file
>  
> -if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
> -  IMGOPTS=compat=1.1
> -fi
> -
>  echo
>  echo "== Creating images =="
>  
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>

Best regards,
	Maxim Levitsky