[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/14] iotests/common.rc: _make_test_img(): smarter compressiont_
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 08/14] iotests/common.rc: _make_test_img(): smarter compressiont_type handling |
Date: |
Mon, 5 Jul 2021 12:15:43 +0300 |
Like it is done in iotests.py in qemu_img_create_prepare_args(), let's
not follow compression_type=zstd of IMGOPTS if test creates image in
old format.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/common.rc | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index cbbf6d7c7f..4cae5b2d70 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -438,6 +438,14 @@ _make_test_img()
backing_file=$param
continue
elif $opts_param; then
+ if [[ "$param" == *"compat=0"* ]]; then
+ # If user specified zstd compression type in IMGOPTS, this will
+ # just not work. So, let's imply forcing zlib compression when
+ # test creates image in old version of the format.
+ # Similarly works qemu_img_create_prepare_args() in iotests.py
+ optstr=$(echo "$optstr" | $SED -e 's/compression_type=\w\+//')
+ optstr=$(_optstr_add "$optstr" "compression_type=zlib")
+ fi
optstr=$(_optstr_add "$optstr" "$param")
opts_param=false
continue
--
2.29.2