diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-11-07 17:36:52 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2020-01-06 13:43:07 +0100 |
| commit | b043b07ce3057ace905e6f22692fa110b45d10eb (patch) | |
| tree | 3d0960404a98ab050c4dda0332a8d2db97b49cb7 /tests/qemu-iotests/060 | |
| parent | 7ab2a25890c9982b02c0e64022c78782da0ad274 (diff) | |
| download | qemu-b043b07ce3057ace905e6f22692fa110b45d10eb.zip qemu-b043b07ce3057ace905e6f22692fa110b45d10eb.tar.gz qemu-b043b07ce3057ace905e6f22692fa110b45d10eb.tar.bz2 | |
iotests: Replace IMGOPTS by _unsupported_imgopts
Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
globally. That is not how it should be done; instead, they should
simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
default anyway).
This makes the tests heed user-specified $IMGOPTS. Some do not work
with all image options, though, so we need to disable them accordingly.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsky@redhat.com>
Message-id: 20191107163708.833192-7-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/060')
| -rwxr-xr-x | tests/qemu-iotests/060 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index 7439be8..932bc2f 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -48,6 +48,8 @@ _filter_io_error() _supported_fmt qcow2 _supported_proto file _supported_os Linux +# These tests only work for compat=1.1 images with refcount_bits=16 +_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' # The repair process will create a large file - so check for availability first _require_large_file 64G @@ -58,8 +60,6 @@ l1_offset=196608 # 0x30000 (XXX: just an assumption) l2_offset=262144 # 0x40000 (XXX: just an assumption) l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption) -IMGOPTS="compat=1.1" - OPEN_RW="open -o overlap-check=all $TEST_IMG" # Overlap checks are done before write operations only, therefore opening an # image read-only makes the overlap-check option irrelevant |