Skip to contentSkip to conversation

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

PATCH Applied Thomas Huth 3 participants 3 messages Dec 18, 2019 – Dec 19, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iotests: Add more "_require_drivers" checks to the shell-based tests

Test 051 should be skipped if nbd is not available, and 267 should be skipped if copy-on-read is not enabled.

---
 tests/qemu-iotests/051 | 1 +
 tests/qemu-iotests/267 | 1 +
 2 files changed, 2 insertions(+)
tests/qemu-iotests/051 +1 -0
index 53bcdbc911..a13bce2fd0 100755
@@ -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()
 {
tests/qemu-iotests/267 +1 -0
index 17ac640a83..c1536f45b9 100755
@@ -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]'
Signature · 1 line
2.18.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Thomas Huth

Test 051 should be skipped if nbd is not available, and 267 should be skipped if copy-on-read is not enabled.

---
  tests/qemu-iotests/051 | 1 +
  tests/qemu-iotests/267 | 1 +
  2 files changed, 2 insertions(+)
Quoted 26 lines
tests/qemu-iotests/051 +1 -0
index 53bcdbc911..a13bce2fd0 100755
@@ -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()
  {
tests/qemu-iotests/267 +1 -0
index 17ac640a83..c1536f45b9 100755
@@ -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]'
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org