qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Kevin Wolf <kwolf@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PATCH v2 04/10] iotests: Fix 232 for LUKS
Date: Wed, 30 Jan 2019 16:24:28 +0100	[thread overview]
Message-ID: <20190130152434.17283-5-mreitz@redhat.com> (raw)
In-Reply-To: <20190130152434.17283-1-mreitz@redhat.com>

With IMGOPTSSYNTAX, $TEST_IMG is useless for this test (it only tests
the file-posix protocol driver).  Therefore, if $TEST_IMG_FILE is set,
use that instead.

Because this test requires the file protocol, $TEST_IMG_FILE will always
be set if $IMGOPTSSYNTAX is true.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/232 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
index 93e5d641a3..e48bc8f5db 100755
--- a/tests/qemu-iotests/232
+++ b/tests/qemu-iotests/232
@@ -69,6 +69,10 @@ size=128M
 
 _make_test_img $size
 
+if [ -n "$TEST_IMG_FILE" ]; then
+    TEST_IMG=$TEST_IMG_FILE
+fi
+
 echo
 echo "=== -drive with read-write image: read-only/auto-read-only combinations ==="
 echo
-- 
2.20.1

  parent reply	other threads:[~2019-01-30 15:25 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-30 15:24 [Qemu-devel] [PATCH v2 00/10] iotests: Fix some issues Max Reitz
2019-01-30 15:24 ` [Qemu-devel] [PATCH v2 01/10] iotests: Re-add filename filters Max Reitz
2019-01-30 15:24 ` [Qemu-devel] [PATCH v2 02/10] iotests: Fix 237 for Python 2.x Max Reitz
2019-01-30 16:35   ` Philippe Mathieu-Daudé
2019-01-30 15:24 ` [Qemu-devel] [PATCH v2 03/10] iotests: Remove superfluous rm from 232 Max Reitz
2019-01-30 15:24 ` Max Reitz [this message]
2019-01-30 15:24 ` [Qemu-devel] [PATCH v2 05/10] iotests: Fix 207 to use QMP filters for qmp_log Max Reitz
2019-01-30 15:24 ` [Qemu-devel] [PATCH v2 06/10] iotests.py: Add is_str() Max Reitz
2019-01-30 20:10   ` John Snow
2019-01-30 15:24 ` [Qemu-devel] [PATCH v2 07/10] iotests.py: Filter filename in any string value Max Reitz
2019-01-30 15:24 ` [Qemu-devel] [PATCH v2 08/10] iotests: Filter SSH paths Max Reitz
2019-01-30 15:24 ` [Qemu-devel] [PATCH v2 09/10] iotests: Let 045 be run concurrently Max Reitz
2019-01-30 20:11   ` John Snow
2019-01-30 15:24 ` [Qemu-devel] [PATCH v2 10/10] iotests.py: s/_/-/g on keys in qmp_log() Max Reitz
2019-01-30 23:09   ` John Snow

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=20190130152434.17283-5-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --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).