aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/081
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2020-11-13 22:17:17 +0100
committerKevin Wolf <kwolf@redhat.com>2020-11-17 12:38:32 +0100
commit55f2c014d7a4f79bc22dc7f018ef785b5d6baf49 (patch)
treef5b19721ae10f4c9b8449d53a3b6e8bd112cedd0 /tests/qemu-iotests/081
parent9ca5b0e8427789438f5f8e8b6cc76bc8eb76c941 (diff)
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>
Diffstat (limited to 'tests/qemu-iotests/081')
-rwxr-xr-xtests/qemu-iotests/0817
1 files 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"