From 407fb56a8e10982d6e04b7a73e0c2cea3bed88b9 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Thu, 7 Nov 2019 17:36:57 +0100 Subject: 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 Reviewed-by: Maxim Levitsky Message-id: 20191107163708.833192-12-mreitz@redhat.com Signed-off-by: Max Reitz --- tests/qemu-iotests/079 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/qemu-iotests/079') diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index 78536d3bbf..3642b51feb 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -47,8 +47,7 @@ echo cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304" for s in $cluster_sizes; do - IMGOPTS=$(_optstr_add "$IMGOPTS" "preallocation=metadata,cluster_size=$s") \ - _make_test_img 4G + _make_test_img -o "preallocation=metadata,cluster_size=$s" 4G done # success, all done -- cgit v1.2.3