Skip to content

Commit

Permalink
iotests/081: Filter image format after testdir
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
XanClic authored and kevmw committed Nov 17, 2020
1 parent 9ca5b0e commit 55f2c01
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions tests/qemu-iotests/081
Expand Up @@ -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"
Expand Down

0 comments on commit 55f2c01

Please sign in to comment.