[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/21] iotests: Add -o and --no-opts to _make_test_img
From: |
Max Reitz |
Subject: |
[PATCH v2 08/21] iotests: Add -o and --no-opts to _make_test_img |
Date: |
Tue, 15 Oct 2019 16:27:16 +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>
Reviewed-by: Maxim Levitsky <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
- [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, 2019/10/15
- [PATCH v2 08/21] iotests: Add -o and --no-opts to _make_test_img,
Max Reitz <=
- [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
- [PATCH v2 18/21] iotests: Make 137 work with data_file, Max Reitz, 2019/10/15