[PULL 19/34] iotests: Replace IMGOPTS='' by --no-opts

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PULL 19/34] iotests: Replace IMGOPTS='' by --no-opts
Date: Mon,  6 Jan 2020 15:41:51 +0100	[thread overview]
Message-ID: <20200106144206.698920-20-mreitz@redhat.com> (raw)
In-Reply-To: <20200106144206.698920-1-mreitz@redhat.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-13-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 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.24.1

next prev parent reply	other threads:[~2020-01-06 15:08 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-06 14:41 [PULL 00/34] Block patches Max Reitz
2020-01-06 14:41 ` [PULL 01/34] block: Add bdrv_qapi_perm_to_blk_perm() Max Reitz
2020-01-06 14:41 ` [PULL 02/34] block: Use bdrv_qapi_perm_to_blk_perm() Max Reitz
2020-01-06 14:41 ` [PULL 03/34] blkdebug: Allow taking/unsharing permissions Max Reitz
2020-01-06 14:41 ` [PULL 04/34] iotests: Add @error to wait_until_completed Max Reitz
2020-01-06 14:41 ` [PULL 05/34] iotests: Add test for failing mirror complete Max Reitz
2020-01-06 14:41 ` [PULL 06/34] throttle-groups: fix memory leak in throttle_group_set_limit: Max Reitz
2020-01-06 14:41 ` [PULL 07/34] qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap Max Reitz
2020-01-06 14:41 ` [PULL 08/34] iotests: s/qocw2/qcow2/ Max Reitz
2020-01-06 14:41 ` [PULL 09/34] iotests/qcow2.py: Add dump-header-exts Max Reitz
2020-01-06 14:41 ` [PULL 10/34] iotests/qcow2.py: Split feature fields into bits Max Reitz
2020-01-06 14:41 ` [PULL 11/34] iotests: Add _filter_json_filename Max Reitz
2020-01-06 14:41 ` [PULL 12/34] iotests: Filter refcount_order in 036 Max Reitz
2020-01-06 14:41 ` [PULL 13/34] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
2020-01-06 14:41 ` [PULL 14/34] iotests: Drop compat=1.1 in 050 Max Reitz
2020-01-06 14:41 ` [PULL 15/34] iotests: Let _make_test_img parse its parameters Max Reitz
2020-01-06 14:41 ` [PULL 16/34] iotests: Add -o and --no-opts to _make_test_img Max Reitz
2020-01-06 14:41 ` [PULL 17/34] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
2020-01-06 14:41 ` [PULL 18/34] iotests: Replace IMGOPTS= by -o Max Reitz
2020-01-06 14:41 ` Max Reitz [this message]
2020-01-06 14:41 ` [PULL 20/34] iotests: Drop IMGOPTS use in 267 Max Reitz
2020-01-06 14:41 ` [PULL 21/34] iotests: Avoid qemu-img create Max Reitz
2020-01-06 14:41 ` [PULL 22/34] iotests: Use _rm_test_img for deleting test images Max Reitz
2020-01-06 14:41 ` [PULL 23/34] iotests: Avoid cp/mv of " Max Reitz
2020-01-06 14:41 ` [PULL 24/34] iotests: Make 091 work with data_file Max Reitz
2020-01-06 14:41 ` [PULL 25/34] iotests: Make 110 " Max Reitz
2020-01-06 14:41 ` [PULL 26/34] iotests: Make 137 " Max Reitz
2020-01-06 14:41 ` [PULL 27/34] iotests: Make 198 " Max Reitz
2020-01-06 14:42 ` [PULL 28/34] iotests: Disable data_file where it cannot be used Max Reitz
2020-01-06 14:42 ` [PULL 29/34] iotests: Allow check -o data_file Max Reitz
2020-01-06 14:42 ` [PULL 30/34] block: introduce compress filter driver Max Reitz
2020-01-06 14:42 ` [PULL 31/34] qcow2: Allow writing compressed data of multiple clusters Max Reitz
2020-01-06 14:42 ` [PULL 32/34] tests/qemu-iotests: add case to write " Max Reitz
2020-01-06 14:42 ` [PULL 33/34] tests/qemu-iotests: Update tests to recent desugarized -accel option Max Reitz
2020-01-06 14:42 ` [PULL 34/34] backup-top: Begin drain earlier Max Reitz
2020-01-06 18:22 ` [PULL 00/34] Block patches Peter Maydell

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:fab526666 dfblob:4e3194324 dfblob:0a952a73f dfblob:e2f14a38c
dfblob:21231cadd dfblob:75b5e8f31 dfblob:1d4f6786d dfblob:4d3d08ad6
dfblob:2eb377d68 dfblob:55a1874dc )
 OR (
bs:"[PULL 19/34] iotests: Replace IMGOPTS='' by --no-opts" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200106144206.698920-20-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).