aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/191
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2019-11-07 17:36:57 +0100
committerMax Reitz <mreitz@redhat.com>2020-01-06 13:43:07 +0100
commit407fb56a8e10982d6e04b7a73e0c2cea3bed88b9 (patch)
tree1aaf59deed30a5b09cfec3c48e41446e5bf83e6c /tests/qemu-iotests/191
parent1c6d2f2128ba5e6848d078436f4252660b4d2af1 (diff)
downloadqemu-407fb56a8e10982d6e04b7a73e0c2cea3bed88b9.zip
qemu-407fb56a8e10982d6e04b7a73e0c2cea3bed88b9.tar.gz
qemu-407fb56a8e10982d6e04b7a73e0c2cea3bed88b9.tar.bz2
iotests: Replace IMGOPTS= by -o
Tests should not overwrite all user-supplied image options, but only add to it (which will effectively overwrite conflicting values). Accomplish this by passing options to _make_test_img via -o instead of $IMGOPTS. For some tests, there is no functional change because they already only appended options to IMGOPTS. For these, this patch is just a simplification. For others, this is a change, so they now heed user-specified $IMGOPTS. Some of those tests do not work with all image options, though, so we need to disable them accordingly. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Message-id: 20191107163708.833192-12-mreitz@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/191')
-rwxr-xr-xtests/qemu-iotests/1913
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 528022e..21c16a3 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -51,8 +51,7 @@ echo === Preparing and starting VM ===
echo
TEST_IMG="${TEST_IMG}.base" _make_test_img $size
-IMGOPTS=$(_optstr_add "$IMGOPTS" "backing_fmt=$IMGFMT") \
- TEST_IMG="${TEST_IMG}.mid" _make_test_img -b "${TEST_IMG}.base"
+TEST_IMG="${TEST_IMG}.mid" _make_test_img -o "backing_fmt=$IMGFMT" -b "${TEST_IMG}.base"
_make_test_img -b "${TEST_IMG}.mid"
TEST_IMG="${TEST_IMG}.ovl2" _make_test_img -b "${TEST_IMG}.mid"