diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-11-07 17:36:57 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2020-01-06 13:43:07 +0100 |
| commit | 407fb56a8e10982d6e04b7a73e0c2cea3bed88b9 (patch) | |
| tree | 1aaf59deed30a5b09cfec3c48e41446e5bf83e6c /tests/qemu-iotests/138 | |
| parent | 1c6d2f2128ba5e6848d078436f4252660b4d2af1 (diff) | |
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/138')
| -rwxr-xr-x | tests/qemu-iotests/138 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 index 8b2f587af0..26d18ac8b6 100755 --- a/tests/qemu-iotests/138 +++ b/tests/qemu-iotests/138 @@ -45,8 +45,7 @@ echo echo '=== Check on an image with a multiple of 2^32 clusters ===' echo -IMGOPTS=$(_optstr_add "$IMGOPTS" "cluster_size=512") \ - _make_test_img 512 +_make_test_img -o "cluster_size=512" 512 # Allocate L2 table $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io |