iotests: Add more "_require_drivers" checks to the shell-based tests
diff mbox series

Message ID 20191218161541.30769-1-thuth@redhat.com
State New
Headers show
Series
  • iotests: Add more "_require_drivers" checks to the shell-based tests
Related show

Commit Message

Thomas Huth Dec. 18, 2019, 4:15 p.m. UTC
Test 051 should be skipped if nbd is not available, and 267 should
be skipped if copy-on-read is not enabled.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/051 | 1 +
 tests/qemu-iotests/267 | 1 +
 2 files changed, 2 insertions(+)

Comments

Eric Blake Dec. 18, 2019, 10:40 p.m. UTC | #1
On 12/18/19 10:15 AM, Thomas Huth wrote:
> Test 051 should be skipped if nbd is not available, and 267 should
> be skipped if copy-on-read is not enabled.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/qemu-iotests/051 | 1 +
>   tests/qemu-iotests/267 | 1 +
>   2 files changed, 2 insertions(+)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
> index 53bcdbc911..a13bce2fd0 100755
> --- a/tests/qemu-iotests/051
> +++ b/tests/qemu-iotests/051
> @@ -41,6 +41,7 @@ _supported_proto file
>   # A compat=0.10 image is created in this test which does not support anything
>   # other than refcount_bits=16
>   _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
> +_require_drivers nbd
>   
>   do_run_qemu()
>   {
> diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
> index 17ac640a83..c1536f45b9 100755
> --- a/tests/qemu-iotests/267
> +++ b/tests/qemu-iotests/267
> @@ -40,6 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>   _supported_fmt qcow2
>   _supported_proto file
>   _supported_os Linux
> +_require_drivers copy-on-read
>   
>   # Internal snapshots are (currently) impossible with refcount_bits=1
>   _unsupported_imgopts 'refcount_bits=1[^0-9]'
>
Kevin Wolf Dec. 19, 2019, 11:56 a.m. UTC | #2
Am 18.12.2019 um 17:15 hat Thomas Huth geschrieben:
> Test 051 should be skipped if nbd is not available, and 267 should
> be skipped if copy-on-read is not enabled.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Thanks, applied to the block branch.

Kevin

Patch
diff mbox series

diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 53bcdbc911..a13bce2fd0 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -41,6 +41,7 @@  _supported_proto file
 # A compat=0.10 image is created in this test which does not support anything
 # other than refcount_bits=16
 _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
+_require_drivers nbd
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index 17ac640a83..c1536f45b9 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -40,6 +40,7 @@  trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+_require_drivers copy-on-read
 
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'