iotests/081: Filter image format after testdir

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>
This commit is contained in:
Max Reitz 2020-11-13 22:17:17 +01:00 committed by Kevin Wolf
parent 9ca5b0e842
commit 55f2c014d7
1 changed files with 4 additions and 3 deletions

View File

@ -45,15 +45,16 @@ _require_drivers quorum
do_run_qemu() do_run_qemu()
{ {
echo Testing: "$@" | _filter_imgfmt echo Testing: "$@"
$QEMU -nographic -qmp stdio -serial none "$@" $QEMU -nographic -qmp stdio -serial none "$@"
echo echo
} }
run_qemu() run_qemu()
{ {
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp\ do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_imgfmt | _filter_qemu \
| _filter_qemu_io | _filter_generated_node_ids | _filter_qmp | _filter_qemu_io \
| _filter_generated_node_ids
} }
quorum="driver=raw,file.driver=quorum,file.vote-threshold=2" quorum="driver=raw,file.driver=quorum,file.vote-threshold=2"