[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/7] iotests/081: Filter image format after testdir
From: |
Kevin Wolf |
Subject: |
[PULL 6/7] iotests/081: Filter image format after testdir |
Date: |
Tue, 17 Nov 2020 13:15:57 +0100 |
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
- [PULL 0/7] Patches for 5.2.0-rc2, Kevin Wolf, 2020/11/17
- [PULL 1/7] char-stdio: Fix QMP default for 'signal', Kevin Wolf, 2020/11/17
- [PULL 3/7] file-posix: allow -EBUSY errors during write zeros on raw block devices, Kevin Wolf, 2020/11/17
- [PULL 2/7] iotests: Replace deprecated ConfigParser.readfp(), Kevin Wolf, 2020/11/17
- [PULL 4/7] io_uring: do not use pointer after free, Kevin Wolf, 2020/11/17
- [PULL 7/7] iotests/081: Test rewrite-corrupted without WRITE, Kevin Wolf, 2020/11/17
- [PULL 5/7] quorum: Require WRITE perm with rewrite-corrupted, Kevin Wolf, 2020/11/17
- [PULL 6/7] iotests/081: Filter image format after testdir,
Kevin Wolf <=
- Re: [PULL 0/7] Patches for 5.2.0-rc2, Peter Maydell, 2020/11/17