[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/34] iotests: Let _make_test_img parse its parameters
From: |
Max Reitz |
Subject: |
[PULL 15/34] iotests: Let _make_test_img parse its parameters |
Date: |
Mon, 6 Jan 2020 15:41:47 +0100 |
This will allow us to add more options than just -b.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <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 555c453911..f01165a66e 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -303,12 +303,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
@@ -324,11 +324,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
@@ -344,9 +356,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.24.1
- [PULL 05/34] iotests: Add test for failing mirror complete, (continued)
- [PULL 05/34] iotests: Add test for failing mirror complete, Max Reitz, 2020/01/06
- [PULL 06/34] throttle-groups: fix memory leak in throttle_group_set_limit:, Max Reitz, 2020/01/06
- [PULL 07/34] qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap, Max Reitz, 2020/01/06
- [PULL 08/34] iotests: s/qocw2/qcow2/, Max Reitz, 2020/01/06
- [PULL 09/34] iotests/qcow2.py: Add dump-header-exts, Max Reitz, 2020/01/06
- [PULL 11/34] iotests: Add _filter_json_filename, Max Reitz, 2020/01/06
- [PULL 10/34] iotests/qcow2.py: Split feature fields into bits, Max Reitz, 2020/01/06
- [PULL 12/34] iotests: Filter refcount_order in 036, Max Reitz, 2020/01/06
- [PULL 13/34] iotests: Replace IMGOPTS by _unsupported_imgopts, Max Reitz, 2020/01/06
- [PULL 14/34] iotests: Drop compat=1.1 in 050, Max Reitz, 2020/01/06
- [PULL 15/34] iotests: Let _make_test_img parse its parameters,
Max Reitz <=
- [PULL 16/34] iotests: Add -o and --no-opts to _make_test_img, Max Reitz, 2020/01/06
- [PULL 17/34] iotests: Inject space into -ocompat=0.10 in 051, Max Reitz, 2020/01/06
- [PULL 20/34] iotests: Drop IMGOPTS use in 267, Max Reitz, 2020/01/06
- [PULL 18/34] iotests: Replace IMGOPTS= by -o, Max Reitz, 2020/01/06
- [PULL 19/34] iotests: Replace IMGOPTS='' by --no-opts, Max Reitz, 2020/01/06
- [PULL 21/34] iotests: Avoid qemu-img create, Max Reitz, 2020/01/06
- [PULL 22/34] iotests: Use _rm_test_img for deleting test images, Max Reitz, 2020/01/06
- [PULL 23/34] iotests: Avoid cp/mv of test images, Max Reitz, 2020/01/06
- [PULL 24/34] iotests: Make 091 work with data_file, Max Reitz, 2020/01/06
- [PULL 25/34] iotests: Make 110 work with data_file, Max Reitz, 2020/01/06