aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2014-12-08 10:48:11 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2014-12-12 15:48:26 +0000
commit9e0c3e8df5d1b12517d587d60b2fe587ea252ebe (patch)
tree693c7da0717378db90e6337b7d30b5a3d5db9dba
parent0e82dc7bbd96f9b0fb76e5fe263ba04b15e68127 (diff)
downloadqemu-9e0c3e8df5d1b12517d587d60b2fe587ea252ebe.zip
qemu-9e0c3e8df5d1b12517d587d60b2fe587ea252ebe.tar.gz
qemu-9e0c3e8df5d1b12517d587d60b2fe587ea252ebe.tar.bz2
iotests: Filter for "Killed" in qemu-io output
_filter_qemu_io already filters out the process ID when qemu-io is aborted; the same should be done when it is killed. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Message-id: 1418032092-16813-3-git-send-email-mreitz@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--tests/qemu-iotests/common.filter2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index dfb9726..6c14590 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -150,7 +150,7 @@ _filter_win32()
_filter_qemu_io()
{
_filter_win32 | sed -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.inf]* [EPTGMKiBbytes]*\/sec and [0-9/.inf]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" \
- -e "s/: line [0-9][0-9]*: *[0-9][0-9]*\( Aborted\)/:\1/" \
+ -e "s/: line [0-9][0-9]*: *[0-9][0-9]*\( Aborted\| Killed\)/:\1/" \
-e "s/qemu-io> //g"
}