[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img
From: |
Max Reitz |
Subject: |
[PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img |
Date: |
Fri, 27 Sep 2019 11:42:29 +0200 |
Blindly overriding IMGOPTS is suboptimal as this discards user-specified
options. Whatever options the test needs should simply be appended.
Some tests do this (with IMGOPTS=$(_optstr_add "$IMGOPTS" "...")), but
that is cumbersome. It’s simpler to just give _make_test_img an -o
parameter with which tests can add options.
Some tests actually must override the user-specified options, though,
for example when creating an image in a different format than the test
$IMGFMT. For such cases, --no-opts allows clearing the current option
list.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/common.rc | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 3e7adc4834..f3784077de 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -287,6 +287,7 @@ _make_test_img()
local use_backing=0
local backing_file=""
local object_options=""
+ local opts_param=false
local misc_params=()
if [ -n "$TEST_IMG_FILE" ]; then
@@ -307,6 +308,10 @@ _make_test_img()
if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
backing_file=$param
continue
+ elif $opts_param; then
+ optstr=$(_optstr_add "$optstr" "$param")
+ opts_param=false
+ continue
fi
case "$param" in
@@ -314,6 +319,14 @@ _make_test_img()
use_backing=1
;;
+ -o)
+ opts_param=true
+ ;;
+
+ --no-opts)
+ optstr=""
+ ;;
+
*)
misc_params=("${misc_params[@]}" "$param")
;;
--
2.21.0
- Re: [PATCH 01/18] iotests: Filter refcount_order in 036, (continued)
[PATCH 04/18] iotests: Let _make_test_img parse its parameters, Max Reitz, 2019/09/27
[PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img,
Max Reitz <=
[PATCH 06/18] iotests: Inject space into -ocompat=0.10 in 051, Max Reitz, 2019/09/27
[PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts, Max Reitz, 2019/09/27
[PATCH 09/18] iotests: Drop IMGOPTS use in 267, Max Reitz, 2019/09/27