[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 12/22] iotests: Replace IMGOPTS='' by --no-opts
From: |
Max Reitz |
Subject: |
[PATCH v3 12/22] iotests: Replace IMGOPTS='' by --no-opts |
Date: |
Thu, 7 Nov 2019 17:36:58 +0100 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
---
tests/qemu-iotests/071 | 4 ++--
tests/qemu-iotests/174 | 2 +-
tests/qemu-iotests/178 | 4 ++--
tests/qemu-iotests/197 | 4 ++--
tests/qemu-iotests/215 | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index fab526666b..4e31943244 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -58,7 +58,7 @@ echo
echo "=== Testing blkverify through filename ==="
echo
-TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
_filter_imgfmt
_make_test_img $IMG_SIZE
$QEMU_IO -c "open -o
driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base $TEST_IMG" \
@@ -73,7 +73,7 @@ echo
echo "=== Testing blkverify through file blockref ==="
echo
-TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
_filter_imgfmt
_make_test_img $IMG_SIZE
$QEMU_IO -c "open -o
driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base,file.test.driver=$IMGFMT,file.test.file.filename=$TEST_IMG"
\
diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174
index 0a952a73fd..e2f14a38c6 100755
--- a/tests/qemu-iotests/174
+++ b/tests/qemu-iotests/174
@@ -40,7 +40,7 @@ _unsupported_fmt raw
size=256K
-IMGFMT=raw IMGKEYSECRET= IMGOPTS= _make_test_img $size | _filter_imgfmt
+IMGFMT=raw IMGKEYSECRET= _make_test_img --no-opts $size | _filter_imgfmt
echo
echo "== reading wrong format should fail =="
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index 21231cadd3..75b5e8f314 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -62,8 +62,8 @@ $QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file
format
make_test_img_with_fmt() {
# Shadow global variables within this function
- local IMGFMT="$1" IMGOPTS=""
- _make_test_img "$2"
+ local IMGFMT="$1"
+ _make_test_img --no-opts "$2"
}
qemu_io_with_fmt() {
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 1d4f6786db..4d3d08ad6f 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -66,8 +66,8 @@ if [ "$IMGFMT" = "vpc" ]; then
fi
_make_test_img 4G
$QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
-IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
- _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+ _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
$QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
# Ensure that a read of two clusters, but where one is already allocated,
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index 2eb377d682..55a1874dcd 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -63,8 +63,8 @@ if [ "$IMGFMT" = "vpc" ]; then
fi
_make_test_img 4G
$QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
-IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
- _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+ _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
$QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
# Ensure that a read of two clusters, but where one is already allocated,
--
2.23.0
- Re: [PATCH v3 01/22] iotests: s/qocw2/qcow2/, (continued)
- [PATCH v3 02/22] iotests/qcow2.py: Add dump-header-exts, Max Reitz, 2019/11/07
- [PATCH v3 03/22] iotests/qcow2.py: Split feature fields into bits, Max Reitz, 2019/11/07
- [PATCH v3 04/22] iotests: Add _filter_json_filename, Max Reitz, 2019/11/07
- [PATCH v3 05/22] iotests: Filter refcount_order in 036, Max Reitz, 2019/11/07
- [PATCH v3 06/22] iotests: Replace IMGOPTS by _unsupported_imgopts, Max Reitz, 2019/11/07
- [PATCH v3 07/22] iotests: Drop compat=1.1 in 050, Max Reitz, 2019/11/07
- [PATCH v3 08/22] iotests: Let _make_test_img parse its parameters, Max Reitz, 2019/11/07
- [PATCH v3 09/22] iotests: Add -o and --no-opts to _make_test_img, Max Reitz, 2019/11/07
- [PATCH v3 10/22] iotests: Inject space into -ocompat=0.10 in 051, Max Reitz, 2019/11/07
- [PATCH v3 12/22] iotests: Replace IMGOPTS='' by --no-opts,
Max Reitz <=
- [PATCH v3 14/22] iotests: Avoid qemu-img create, Max Reitz, 2019/11/07
- [PATCH v3 13/22] iotests: Drop IMGOPTS use in 267, Max Reitz, 2019/11/07
- [PATCH v3 11/22] iotests: Replace IMGOPTS= by -o, Max Reitz, 2019/11/07
- [PATCH v3 16/22] iotests: Avoid cp/mv of test images, Max Reitz, 2019/11/07
- [PATCH v3 17/22] iotests: Make 091 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 15/22] iotests: Use _rm_test_img for deleting test images, Max Reitz, 2019/11/07
- [PATCH v3 18/22] iotests: Make 110 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 19/22] iotests: Make 137 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 20/22] iotests: Make 198 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 22/22] iotests: Allow check -o data_file, Max Reitz, 2019/11/07