[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/21] iotests: Let _make_test_img parse its parameters
From: |
Max Reitz |
Subject: |
[PATCH v2 07/21] iotests: Let _make_test_img parse its parameters |
Date: |
Tue, 15 Oct 2019 16:27:15 +0200 |
This will allow us to add more options than just -b.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
---
tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 12b4751848..3e7adc4834 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -282,12 +282,12 @@ _make_test_img()
# extra qemu-img options can be added by tests
# at least one argument (the image size) needs to be added
local extra_img_options=""
- local image_size=$*
local optstr=""
local img_name=""
local use_backing=0
local backing_file=""
local object_options=""
+ local misc_params=()
if [ -n "$TEST_IMG_FILE" ]; then
img_name=$TEST_IMG_FILE
@@ -303,11 +303,23 @@ _make_test_img()
optstr=$(_optstr_add "$optstr" "key-secret=keysec0")
fi
- if [ "$1" = "-b" ]; then
- use_backing=1
- backing_file=$2
- image_size=$3
- fi
+ for param; do
+ if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
+ backing_file=$param
+ continue
+ fi
+
+ case "$param" in
+ -b)
+ use_backing=1
+ ;;
+
+ *)
+ misc_params=("${misc_params[@]}" "$param")
+ ;;
+ esac
+ done
+
if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE"
]; then
optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE")
fi
@@ -323,9 +335,9 @@ _make_test_img()
# XXX(hch): have global image options?
(
if [ $use_backing = 1 ]; then
- $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b
"$backing_file" "$img_name" $image_size 2>&1
+ $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b
"$backing_file" "$img_name" "${misc_params[@]}" 2>&1
else
- $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options
"$img_name" $image_size 2>&1
+ $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options
"$img_name" "${misc_params[@]}" 2>&1
fi
) | _filter_img_create
--
2.21.0
- [PATCH v2 00/21] iotests: Allow ./check -o data_file, Max Reitz, 2019/10/15
- [PATCH v2 01/21] iotests/qcow2.py: Add dump-header-exts, Max Reitz, 2019/10/15
- [PATCH v2 03/21] iotests: Add _filter_json_filename, Max Reitz, 2019/10/15
- [PATCH v2 02/21] iotests/qcow2.py: Split feature fields into bits, Max Reitz, 2019/10/15
- [PATCH v2 04/21] iotests: Filter refcount_order in 036, Max Reitz, 2019/10/15
- [PATCH v2 05/21] iotests: Replace IMGOPTS by _unsupported_imgopts, Max Reitz, 2019/10/15
- [PATCH v2 06/21] iotests: Drop compat=1.1 in 050, Max Reitz, 2019/10/15
- [PATCH v2 07/21] iotests: Let _make_test_img parse its parameters,
Max Reitz <=
- [PATCH v2 08/21] iotests: Add -o and --no-opts to _make_test_img, Max Reitz, 2019/10/15
- [PATCH v2 09/21] iotests: Inject space into -ocompat=0.10 in 051, Max Reitz, 2019/10/15
- [PATCH v2 12/21] iotests: Drop IMGOPTS use in 267, Max Reitz, 2019/10/15
- [PATCH v2 11/21] iotests: Replace IMGOPTS='' by --no-opts, Max Reitz, 2019/10/15
- [PATCH v2 13/21] iotests: Avoid qemu-img create, Max Reitz, 2019/10/15
- [PATCH v2 10/21] iotests: Replace IMGOPTS= by -o, Max Reitz, 2019/10/15
- [PATCH v2 15/21] iotests: Avoid cp/mv of test images, Max Reitz, 2019/10/15
- [PATCH v2 14/21] iotests: Use _rm_test_img for deleting test images, Max Reitz, 2019/10/15
- [PATCH v2 16/21] iotests: Make 091 work with data_file, Max Reitz, 2019/10/15
- [PATCH v2 17/21] iotests: Make 110 work with data_file, Max Reitz, 2019/10/15