On 29.09.19 18:33, Maxim Levitsky wrote: > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote: >> Tests should not overwrite all user-supplied image options, but only add >> to it (which will effectively overwrite conflicting values). Accomplish >> this by passing options to _make_test_img via -o instead of $IMGOPTS. >> >> For some tests, there is no functional change because they already only >> appended options to IMGOPTS. For these, this patch is just a >> simplification. >> >> For others, this is a change, so they now heed user-specified $IMGOPTS. >> Some of those tests do not work with all image options, though, so we >> need to disable them accordingly. >> >> Signed-off-by: Max Reitz <mre...@redhat.com> >> --- >> tests/qemu-iotests/031 | 9 ++++--- >> tests/qemu-iotests/039 | 24 ++++++------------ >> tests/qemu-iotests/059 | 18 ++++++------- >> tests/qemu-iotests/060 | 6 ++--- >> tests/qemu-iotests/061 | 57 ++++++++++++++++++++++-------------------- >> tests/qemu-iotests/079 | 3 +-- >> tests/qemu-iotests/106 | 2 +- >> tests/qemu-iotests/108 | 2 +- >> tests/qemu-iotests/112 | 32 ++++++++++++------------ >> tests/qemu-iotests/115 | 3 +-- >> tests/qemu-iotests/121 | 6 ++--- >> tests/qemu-iotests/125 | 2 +- >> tests/qemu-iotests/137 | 2 +- >> tests/qemu-iotests/138 | 3 +-- >> tests/qemu-iotests/175 | 2 +- >> tests/qemu-iotests/190 | 2 +- >> tests/qemu-iotests/191 | 3 +-- >> tests/qemu-iotests/220 | 4 ++- >> tests/qemu-iotests/243 | 6 +++-- >> tests/qemu-iotests/244 | 10 +++++--- >> tests/qemu-iotests/250 | 3 +-- >> tests/qemu-iotests/265 | 2 +- >> 22 files changed, 100 insertions(+), 101 deletions(-)
[...] >> diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 >> index 325da63a4c..99563bf126 100755 >> --- a/tests/qemu-iotests/039 >> +++ b/tests/qemu-iotests/039 >> @@ -50,8 +50,7 @@ size=128M >> echo >> echo "== Checking that image is clean on shutdown ==" >> >> -IMGOPTS="compat=1.1,lazy_refcounts=on" >> -_make_test_img $size >> +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size > Any reason for compat=1.1 here? Other that it was before like that. Lazy refcounts only work with qcow2 v3 (compat=1.1). Max
signature.asc
Description: OpenPGP digital signature
