Re: [PATCH v2 20/21] iotests: Disable data_file where it cannot be used
On 07.11.19 16:19, Maxim Levitsky wrote: > On Thu, 2019-11-07 at 12:36 +0100, Max Reitz wrote: >> On 06.11.19 16:52, Maxim Levitsky wrote: >>> On Tue, 2019-10-15 at 16:27 +0200, Max Reitz wrote: Signed-off-by: Max Reitz --- tests/qemu-iotests/007 | 5 +++-- tests/qemu-iotests/014 | 2 ++ tests/qemu-iotests/015 | 5 +++-- tests/qemu-iotests/026 | 5 - tests/qemu-iotests/029 | 5 +++-- tests/qemu-iotests/031 | 6 +++--- tests/qemu-iotests/036 | 5 +++-- tests/qemu-iotests/039 | 3 +++ tests/qemu-iotests/046 | 2 ++ tests/qemu-iotests/048 | 2 ++ tests/qemu-iotests/051 | 5 +++-- tests/qemu-iotests/058 | 5 +++-- tests/qemu-iotests/060 | 6 -- tests/qemu-iotests/061 | 6 -- tests/qemu-iotests/062 | 2 +- tests/qemu-iotests/066 | 2 +- tests/qemu-iotests/067 | 6 -- tests/qemu-iotests/068 | 5 +++-- tests/qemu-iotests/071 | 3 +++ tests/qemu-iotests/073 | 2 ++ tests/qemu-iotests/074 | 2 ++ tests/qemu-iotests/080 | 5 +++-- tests/qemu-iotests/090 | 2 ++ tests/qemu-iotests/098 | 6 -- tests/qemu-iotests/099 | 3 ++- tests/qemu-iotests/103 | 5 +++-- tests/qemu-iotests/108 | 6 -- tests/qemu-iotests/112 | 5 +++-- tests/qemu-iotests/114 | 2 ++ tests/qemu-iotests/121 | 3 +++ tests/qemu-iotests/138 | 2 ++ tests/qemu-iotests/156 | 2 ++ tests/qemu-iotests/176 | 7 +-- tests/qemu-iotests/191 | 2 ++ tests/qemu-iotests/201 | 6 +++--- tests/qemu-iotests/214 | 3 ++- tests/qemu-iotests/217 | 3 ++- tests/qemu-iotests/220 | 5 +++-- tests/qemu-iotests/243 | 6 -- tests/qemu-iotests/244 | 5 +++-- tests/qemu-iotests/250 | 2 ++ tests/qemu-iotests/267 | 5 +++-- 42 files changed, 117 insertions(+), 52 deletions(-) >> >> [...] >> diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index c44fcf91bb..646ecd593f 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -40,9 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 _supported_proto file -# We want to test compat=0.10, which does not support refcount widths -# other than 16 -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' +# We want to test compat=0.10, which does not support external data +# files or refcount widths other than 16 +_unsupported_imgopts data_file 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' >>> >>> This is maybe another reason to split this test for compat=0.10 and for >>> compat=1.1 >>> But still can be done later of course. >> >> Hm, but I don’t really think this test is important for external data >> files. There is no I/O. > I guess both yes and no, the external data file is a header extension as well. Yes, but the test already involves a header extension. diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index bbaf0ef45b..512598421c 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -43,8 +43,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 _supported_proto file -# Only qcow2v3 and later supports feature bits -_unsupported_imgopts 'compat=0.10' +# Only qcow2v3 and later supports feature bits; +# qcow2.py does not support external data files >>> >>> Minor nitpick, maybe tag this with TODO or so. No need to do now. >> >> Hm, well, and the same applies here. (Just not a very important test.) > Same here, in theory external data file is a feature, and it could > 'interact' with other features, but most likely you are right here as well. Well, but the test currently doesn’t involve any known feature bits. It’s mostly about checking what our qcow2 driver does with unknown feature bits. (If it wanted to involve known feature bits, it could have easily used e.g. the dirty feature.) diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 index a8feb76184..2af6b74b41 100755 --- a/tests/qemu-iotests/048 +++ b/tests/qemu-iotests/048 @@ -49,6 +49,8 @@ _compare() _supported_fmt raw qcow2 qed luks _supported_proto file _supported_os Linux +# Using 'cp' is incompatible with external data files +_unsupported_imgopts data_file >>> >>> You could compare the external files instead in theory *I think*. >>> Another item on some TODO list I guess. >> >> This is a test of qemu-img compare, not of the image format. So it >> doesn’t make much sense to me to compare the external files, and also it >> should be completely sufficient to run this test only without external >> data files. > Yes but on the other hand, its is kind of nice to test that it can compare > correctly > two qcow2 files which have external data
Re: [PATCH v2 20/21] iotests: Disable data_file where it cannot be used
On Thu, 2019-11-07 at 12:36 +0100, Max Reitz wrote: > On 06.11.19 16:52, Maxim Levitsky wrote: > > On Tue, 2019-10-15 at 16:27 +0200, Max Reitz wrote: > > > Signed-off-by: Max Reitz > > > --- > > > tests/qemu-iotests/007 | 5 +++-- > > > tests/qemu-iotests/014 | 2 ++ > > > tests/qemu-iotests/015 | 5 +++-- > > > tests/qemu-iotests/026 | 5 - > > > tests/qemu-iotests/029 | 5 +++-- > > > tests/qemu-iotests/031 | 6 +++--- > > > tests/qemu-iotests/036 | 5 +++-- > > > tests/qemu-iotests/039 | 3 +++ > > > tests/qemu-iotests/046 | 2 ++ > > > tests/qemu-iotests/048 | 2 ++ > > > tests/qemu-iotests/051 | 5 +++-- > > > tests/qemu-iotests/058 | 5 +++-- > > > tests/qemu-iotests/060 | 6 -- > > > tests/qemu-iotests/061 | 6 -- > > > tests/qemu-iotests/062 | 2 +- > > > tests/qemu-iotests/066 | 2 +- > > > tests/qemu-iotests/067 | 6 -- > > > tests/qemu-iotests/068 | 5 +++-- > > > tests/qemu-iotests/071 | 3 +++ > > > tests/qemu-iotests/073 | 2 ++ > > > tests/qemu-iotests/074 | 2 ++ > > > tests/qemu-iotests/080 | 5 +++-- > > > tests/qemu-iotests/090 | 2 ++ > > > tests/qemu-iotests/098 | 6 -- > > > tests/qemu-iotests/099 | 3 ++- > > > tests/qemu-iotests/103 | 5 +++-- > > > tests/qemu-iotests/108 | 6 -- > > > tests/qemu-iotests/112 | 5 +++-- > > > tests/qemu-iotests/114 | 2 ++ > > > tests/qemu-iotests/121 | 3 +++ > > > tests/qemu-iotests/138 | 2 ++ > > > tests/qemu-iotests/156 | 2 ++ > > > tests/qemu-iotests/176 | 7 +-- > > > tests/qemu-iotests/191 | 2 ++ > > > tests/qemu-iotests/201 | 6 +++--- > > > tests/qemu-iotests/214 | 3 ++- > > > tests/qemu-iotests/217 | 3 ++- > > > tests/qemu-iotests/220 | 5 +++-- > > > tests/qemu-iotests/243 | 6 -- > > > tests/qemu-iotests/244 | 5 +++-- > > > tests/qemu-iotests/250 | 2 ++ > > > tests/qemu-iotests/267 | 5 +++-- > > > 42 files changed, 117 insertions(+), 52 deletions(-) > > [...] > > > > diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 > > > index c44fcf91bb..646ecd593f 100755 > > > --- a/tests/qemu-iotests/031 > > > +++ b/tests/qemu-iotests/031 > > > @@ -40,9 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > > > # This tests qcow2-specific low-level functionality > > > _supported_fmt qcow2 > > > _supported_proto file > > > -# We want to test compat=0.10, which does not support refcount widths > > > -# other than 16 > > > -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' > > > +# We want to test compat=0.10, which does not support external data > > > +# files or refcount widths other than 16 > > > +_unsupported_imgopts data_file 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' > > > > This is maybe another reason to split this test for compat=0.10 and for > > compat=1.1 > > But still can be done later of course. > > Hm, but I don’t really think this test is important for external data > files. There is no I/O. I guess both yes and no, the external data file is a header extension as well. I am looking at the tests from the point of view of someone that doesn't know the qcow2 internally well yet, so I noted all the tests that looked like they can still catch something. > > [...] > > > > diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 > > > index bbaf0ef45b..512598421c 100755 > > > --- a/tests/qemu-iotests/036 > > > +++ b/tests/qemu-iotests/036 > > > @@ -43,8 +43,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > > > # This tests qcow2-specific low-level functionality > > > _supported_fmt qcow2 > > > _supported_proto file > > > -# Only qcow2v3 and later supports feature bits > > > -_unsupported_imgopts 'compat=0.10' > > > +# Only qcow2v3 and later supports feature bits; > > > +# qcow2.py does not support external data files > > > > Minor nitpick, maybe tag this with TODO or so. No need to do now. > > Hm, well, and the same applies here. (Just not a very important test.) Same here, in theory external data file is a feature, and it could 'interact' with other features, but most likely you are right here as well. > > [...] > > > > diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 > > > index 4e03ead7b1..a066eec605 100755 > > > --- a/tests/qemu-iotests/046 > > > +++ b/tests/qemu-iotests/046 > > > @@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > > > > > > _supported_fmt qcow2 > > > _supported_proto file > > > +# data_file does not support compressed clusters > > > +_unsupported_imgopts data_file > > > > This is a very nice test, which doesn't seem to use compressed > > clusters that much. I think it should be split as well. > > No need to do this now of course, but maybe mark with TODO to > > avoid loosing that info. > > The other problem is that blkdebug doesn’t work so well with external > data files, so basically this whole test doesn’t work. Yes, I see now that the test uses the blkdebug. > > [...] > > > > diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 > > > index a8feb76184..2af6b74b41 100755 > > > ---
Re: [PATCH v2 20/21] iotests: Disable data_file where it cannot be used
On 06.11.19 16:52, Maxim Levitsky wrote: > On Tue, 2019-10-15 at 16:27 +0200, Max Reitz wrote: >> Signed-off-by: Max Reitz >> --- >> tests/qemu-iotests/007 | 5 +++-- >> tests/qemu-iotests/014 | 2 ++ >> tests/qemu-iotests/015 | 5 +++-- >> tests/qemu-iotests/026 | 5 - >> tests/qemu-iotests/029 | 5 +++-- >> tests/qemu-iotests/031 | 6 +++--- >> tests/qemu-iotests/036 | 5 +++-- >> tests/qemu-iotests/039 | 3 +++ >> tests/qemu-iotests/046 | 2 ++ >> tests/qemu-iotests/048 | 2 ++ >> tests/qemu-iotests/051 | 5 +++-- >> tests/qemu-iotests/058 | 5 +++-- >> tests/qemu-iotests/060 | 6 -- >> tests/qemu-iotests/061 | 6 -- >> tests/qemu-iotests/062 | 2 +- >> tests/qemu-iotests/066 | 2 +- >> tests/qemu-iotests/067 | 6 -- >> tests/qemu-iotests/068 | 5 +++-- >> tests/qemu-iotests/071 | 3 +++ >> tests/qemu-iotests/073 | 2 ++ >> tests/qemu-iotests/074 | 2 ++ >> tests/qemu-iotests/080 | 5 +++-- >> tests/qemu-iotests/090 | 2 ++ >> tests/qemu-iotests/098 | 6 -- >> tests/qemu-iotests/099 | 3 ++- >> tests/qemu-iotests/103 | 5 +++-- >> tests/qemu-iotests/108 | 6 -- >> tests/qemu-iotests/112 | 5 +++-- >> tests/qemu-iotests/114 | 2 ++ >> tests/qemu-iotests/121 | 3 +++ >> tests/qemu-iotests/138 | 2 ++ >> tests/qemu-iotests/156 | 2 ++ >> tests/qemu-iotests/176 | 7 +-- >> tests/qemu-iotests/191 | 2 ++ >> tests/qemu-iotests/201 | 6 +++--- >> tests/qemu-iotests/214 | 3 ++- >> tests/qemu-iotests/217 | 3 ++- >> tests/qemu-iotests/220 | 5 +++-- >> tests/qemu-iotests/243 | 6 -- >> tests/qemu-iotests/244 | 5 +++-- >> tests/qemu-iotests/250 | 2 ++ >> tests/qemu-iotests/267 | 5 +++-- >> 42 files changed, 117 insertions(+), 52 deletions(-) [...] >> diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 >> index c44fcf91bb..646ecd593f 100755 >> --- a/tests/qemu-iotests/031 >> +++ b/tests/qemu-iotests/031 >> @@ -40,9 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 >> # This tests qcow2-specific low-level functionality >> _supported_fmt qcow2 >> _supported_proto file >> -# We want to test compat=0.10, which does not support refcount widths >> -# other than 16 >> -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' >> +# We want to test compat=0.10, which does not support external data >> +# files or refcount widths other than 16 >> +_unsupported_imgopts data_file 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' > > This is maybe another reason to split this test for compat=0.10 and for > compat=1.1 > But still can be done later of course. Hm, but I don’t really think this test is important for external data files. There is no I/O. [...] >> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 >> index bbaf0ef45b..512598421c 100755 >> --- a/tests/qemu-iotests/036 >> +++ b/tests/qemu-iotests/036 >> @@ -43,8 +43,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 >> # This tests qcow2-specific low-level functionality >> _supported_fmt qcow2 >> _supported_proto file >> -# Only qcow2v3 and later supports feature bits >> -_unsupported_imgopts 'compat=0.10' >> +# Only qcow2v3 and later supports feature bits; >> +# qcow2.py does not support external data files > > Minor nitpick, maybe tag this with TODO or so. No need to do now. Hm, well, and the same applies here. (Just not a very important test.) [...] >> diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 >> index 4e03ead7b1..a066eec605 100755 >> --- a/tests/qemu-iotests/046 >> +++ b/tests/qemu-iotests/046 >> @@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 >> >> _supported_fmt qcow2 >> _supported_proto file >> +# data_file does not support compressed clusters >> +_unsupported_imgopts data_file > This is a very nice test, which doesn't seem to use compressed > clusters that much. I think it should be split as well. > No need to do this now of course, but maybe mark with TODO to > avoid loosing that info. The other problem is that blkdebug doesn’t work so well with external data files, so basically this whole test doesn’t work. [...] >> diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 >> index a8feb76184..2af6b74b41 100755 >> --- a/tests/qemu-iotests/048 >> +++ b/tests/qemu-iotests/048 >> @@ -49,6 +49,8 @@ _compare() >> _supported_fmt raw qcow2 qed luks >> _supported_proto file >> _supported_os Linux >> +# Using 'cp' is incompatible with external data files >> +_unsupported_imgopts data_file > You could compare the external files instead in theory *I think*. > Another item on some TODO list I guess. This is a test of qemu-img compare, not of the image format. So it doesn’t make much sense to me to compare the external files, and also it should be completely sufficient to run this test only without external data files. [...] >> diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 >> index 9cd1d60d45..0053bad46a 100755 >> --- a/tests/qemu-iotests/051 >> +++ b/tests/qemu-iotests/051 >> @@ -39,8 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 >>
Re: [PATCH v2 20/21] iotests: Disable data_file where it cannot be used
On Tue, 2019-10-15 at 16:27 +0200, Max Reitz wrote: > Signed-off-by: Max Reitz > --- > tests/qemu-iotests/007 | 5 +++-- > tests/qemu-iotests/014 | 2 ++ > tests/qemu-iotests/015 | 5 +++-- > tests/qemu-iotests/026 | 5 - > tests/qemu-iotests/029 | 5 +++-- > tests/qemu-iotests/031 | 6 +++--- > tests/qemu-iotests/036 | 5 +++-- > tests/qemu-iotests/039 | 3 +++ > tests/qemu-iotests/046 | 2 ++ > tests/qemu-iotests/048 | 2 ++ > tests/qemu-iotests/051 | 5 +++-- > tests/qemu-iotests/058 | 5 +++-- > tests/qemu-iotests/060 | 6 -- > tests/qemu-iotests/061 | 6 -- > tests/qemu-iotests/062 | 2 +- > tests/qemu-iotests/066 | 2 +- > tests/qemu-iotests/067 | 6 -- > tests/qemu-iotests/068 | 5 +++-- > tests/qemu-iotests/071 | 3 +++ > tests/qemu-iotests/073 | 2 ++ > tests/qemu-iotests/074 | 2 ++ > tests/qemu-iotests/080 | 5 +++-- > tests/qemu-iotests/090 | 2 ++ > tests/qemu-iotests/098 | 6 -- > tests/qemu-iotests/099 | 3 ++- > tests/qemu-iotests/103 | 5 +++-- > tests/qemu-iotests/108 | 6 -- > tests/qemu-iotests/112 | 5 +++-- > tests/qemu-iotests/114 | 2 ++ > tests/qemu-iotests/121 | 3 +++ > tests/qemu-iotests/138 | 2 ++ > tests/qemu-iotests/156 | 2 ++ > tests/qemu-iotests/176 | 7 +-- > tests/qemu-iotests/191 | 2 ++ > tests/qemu-iotests/201 | 6 +++--- > tests/qemu-iotests/214 | 3 ++- > tests/qemu-iotests/217 | 3 ++- > tests/qemu-iotests/220 | 5 +++-- > tests/qemu-iotests/243 | 6 -- > tests/qemu-iotests/244 | 5 +++-- > tests/qemu-iotests/250 | 2 ++ > tests/qemu-iotests/267 | 5 +++-- > 42 files changed, 117 insertions(+), 52 deletions(-) > > diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 > index 7d3544b479..160683adf8 100755 > --- a/tests/qemu-iotests/007 > +++ b/tests/qemu-iotests/007 > @@ -41,8 +41,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > _supported_fmt qcow2 > _supported_proto generic > # refcount_bits must be at least 4 so we can create ten internal snapshots > -# (1 bit supports none, 2 bits support two, 4 bits support 14) > -_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' > +# (1 bit supports none, 2 bits support two, 4 bits support 14); > +# snapshot are generally impossible with external data files > +_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' data_file ACK > > echo > echo "creating image" > diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 > index 2f728a1956..e1221c0fff 100755 > --- a/tests/qemu-iotests/014 > +++ b/tests/qemu-iotests/014 > @@ -43,6 +43,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > _supported_fmt qcow2 > _supported_proto file > _supported_os Linux > +# Compression and snapshots do not work with external data files > +_unsupported_imgopts data_file ACK > > TEST_OFFSETS="0 4294967296" > TEST_OPS="writev read write readv" > diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 > index eec5387f3d..4d8effd0ae 100755 > --- a/tests/qemu-iotests/015 > +++ b/tests/qemu-iotests/015 > @@ -40,8 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > # actually any format that supports snapshots > _supported_fmt qcow2 > _supported_proto generic > -# Internal snapshots are (currently) impossible with refcount_bits=1 > -_unsupported_imgopts 'refcount_bits=1[^0-9]' > +# Internal snapshots are (currently) impossible with refcount_bits=1, > +# and generally impossible with external data files ACK > +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file > > echo > echo "creating image" > diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 > index 3430029ed6..a4aa74764f 100755 > --- a/tests/qemu-iotests/026 > +++ b/tests/qemu-iotests/026 > @@ -49,7 +49,10 @@ _supported_cache_modes writethrough none > # 32 and 64 bits do not work either, however, due to different leaked cluster > # count on error. > # Thus, the only remaining option is refcount_bits=16. > -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' > +# > +# As for data_file, none of the refcount tests can work for it. ACK > +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' \ > +data_file > > echo "Errors while writing 128 kB" > echo > diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 > index 9254ede5e5..2161a4b87a 100755 > --- a/tests/qemu-iotests/029 > +++ b/tests/qemu-iotests/029 > @@ -42,8 +42,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > _supported_fmt qcow2 > _supported_proto generic > _unsupported_proto vxhs > -# Internal snapshots are (currently) impossible with refcount_bits=1 > -_unsupported_imgopts 'refcount_bits=1[^0-9]' > +# Internal snapshots are (currently) impossible with refcount_bits=1, > +# and generally impossible with external data files ACK > +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file > > offset_size=24 > offset_l1_size=36 > diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 > index c44fcf91bb..646ecd593f 100755 > --- a/tests/qemu-iotests/031 > +++ b/tests/qemu-iotests/031 > @@ -40,9 +40,9 @@ trap
[PATCH v2 20/21] iotests: Disable data_file where it cannot be used
Signed-off-by: Max Reitz --- tests/qemu-iotests/007 | 5 +++-- tests/qemu-iotests/014 | 2 ++ tests/qemu-iotests/015 | 5 +++-- tests/qemu-iotests/026 | 5 - tests/qemu-iotests/029 | 5 +++-- tests/qemu-iotests/031 | 6 +++--- tests/qemu-iotests/036 | 5 +++-- tests/qemu-iotests/039 | 3 +++ tests/qemu-iotests/046 | 2 ++ tests/qemu-iotests/048 | 2 ++ tests/qemu-iotests/051 | 5 +++-- tests/qemu-iotests/058 | 5 +++-- tests/qemu-iotests/060 | 6 -- tests/qemu-iotests/061 | 6 -- tests/qemu-iotests/062 | 2 +- tests/qemu-iotests/066 | 2 +- tests/qemu-iotests/067 | 6 -- tests/qemu-iotests/068 | 5 +++-- tests/qemu-iotests/071 | 3 +++ tests/qemu-iotests/073 | 2 ++ tests/qemu-iotests/074 | 2 ++ tests/qemu-iotests/080 | 5 +++-- tests/qemu-iotests/090 | 2 ++ tests/qemu-iotests/098 | 6 -- tests/qemu-iotests/099 | 3 ++- tests/qemu-iotests/103 | 5 +++-- tests/qemu-iotests/108 | 6 -- tests/qemu-iotests/112 | 5 +++-- tests/qemu-iotests/114 | 2 ++ tests/qemu-iotests/121 | 3 +++ tests/qemu-iotests/138 | 2 ++ tests/qemu-iotests/156 | 2 ++ tests/qemu-iotests/176 | 7 +-- tests/qemu-iotests/191 | 2 ++ tests/qemu-iotests/201 | 6 +++--- tests/qemu-iotests/214 | 3 ++- tests/qemu-iotests/217 | 3 ++- tests/qemu-iotests/220 | 5 +++-- tests/qemu-iotests/243 | 6 -- tests/qemu-iotests/244 | 5 +++-- tests/qemu-iotests/250 | 2 ++ tests/qemu-iotests/267 | 5 +++-- 42 files changed, 117 insertions(+), 52 deletions(-) diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index 7d3544b479..160683adf8 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -41,8 +41,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic # refcount_bits must be at least 4 so we can create ten internal snapshots -# (1 bit supports none, 2 bits support two, 4 bits support 14) -_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' +# (1 bit supports none, 2 bits support two, 4 bits support 14); +# snapshot are generally impossible with external data files +_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' data_file echo echo "creating image" diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 index 2f728a1956..e1221c0fff 100755 --- a/tests/qemu-iotests/014 +++ b/tests/qemu-iotests/014 @@ -43,6 +43,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file _supported_os Linux +# Compression and snapshots do not work with external data files +_unsupported_imgopts data_file TEST_OFFSETS="0 4294967296" TEST_OPS="writev read write readv" diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 index eec5387f3d..4d8effd0ae 100755 --- a/tests/qemu-iotests/015 +++ b/tests/qemu-iotests/015 @@ -40,8 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # actually any format that supports snapshots _supported_fmt qcow2 _supported_proto generic -# Internal snapshots are (currently) impossible with refcount_bits=1 -_unsupported_imgopts 'refcount_bits=1[^0-9]' +# Internal snapshots are (currently) impossible with refcount_bits=1, +# and generally impossible with external data files +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file echo echo "creating image" diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index 3430029ed6..a4aa74764f 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -49,7 +49,10 @@ _supported_cache_modes writethrough none # 32 and 64 bits do not work either, however, due to different leaked cluster # count on error. # Thus, the only remaining option is refcount_bits=16. -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' +# +# As for data_file, none of the refcount tests can work for it. +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' \ +data_file echo "Errors while writing 128 kB" echo diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index 9254ede5e5..2161a4b87a 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -42,8 +42,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic _unsupported_proto vxhs -# Internal snapshots are (currently) impossible with refcount_bits=1 -_unsupported_imgopts 'refcount_bits=1[^0-9]' +# Internal snapshots are (currently) impossible with refcount_bits=1, +# and generally impossible with external data files +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file offset_size=24 offset_l1_size=36 diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index c44fcf91bb..646ecd593f 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -40,9 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 _supported_proto file -# We want to test compat=0.10, which does not support refcount widths -# other than 16 -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' +# We want to test compat=0.10, which does not support external
