From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 6/7] iotests/081: Filter image format after testdir
Date: Tue, 17 Nov 2020 13:15:57 +0100 [thread overview]
Message-ID: <20201117121558.249585-7-kwolf@redhat.com> (raw)
In-Reply-To: <20201117121558.249585-1-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
Otherwise, this breaks whenever the test directory contains the image
format (e.g. "/tmp/test-raw-file" is filtered to "/tmp/test-IMGFMT-file"
instead of "TEST_DIR").
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201113211718.261671-3-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/081 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index 537d40dfd5..253b7576be 100755
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081
@@ -45,15 +45,16 @@ _require_drivers quorum
do_run_qemu()
{
- echo Testing: "$@" | _filter_imgfmt
+ echo Testing: "$@"
$QEMU -nographic -qmp stdio -serial none "$@"
echo
}
run_qemu()
{
- do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp\
- | _filter_qemu_io | _filter_generated_node_ids
+ do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_imgfmt | _filter_qemu \
+ | _filter_qmp | _filter_qemu_io \
+ | _filter_generated_node_ids
}
quorum="driver=raw,file.driver=quorum,file.vote-threshold=2"
--
2.28.0
next prev parent reply other threads:[~2020-11-17 12:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 12:15 [PULL 0/7] Patches for 5.2.0-rc2 Kevin Wolf
2020-11-17 12:15 ` [PULL 1/7] char-stdio: Fix QMP default for 'signal' Kevin Wolf
2020-11-17 12:15 ` [PULL 2/7] iotests: Replace deprecated ConfigParser.readfp() Kevin Wolf
2020-11-17 12:15 ` [PULL 3/7] file-posix: allow -EBUSY errors during write zeros on raw block devices Kevin Wolf
2020-11-17 12:15 ` [PULL 4/7] io_uring: do not use pointer after free Kevin Wolf
2020-11-17 12:15 ` [PULL 5/7] quorum: Require WRITE perm with rewrite-corrupted Kevin Wolf
2020-11-17 12:15 ` Kevin Wolf [this message]
2020-11-17 12:15 ` [PULL 7/7] iotests/081: Test rewrite-corrupted without WRITE Kevin Wolf
2020-11-17 16:40 ` [PULL 0/7] Patches for 5.2.0-rc2 Peter Maydell
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=20201117121558.249585-7-kwolf@redhat.com \
--to=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).