diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2011-04-29 15:30:25 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-02-29 15:48:44 +0100 |
| commit | a06d5cc20b574e24630d9e59bf2a707728bc3101 (patch) | |
| tree | 3f9bb441ce882421c00fd7fc6544e73f44645659 | |
| parent | 37ce63eb23ad092e88891cf458bd3491af65d0a3 (diff) | |
| download | qemu-a06d5cc20b574e24630d9e59bf2a707728bc3101.zip qemu-a06d5cc20b574e24630d9e59bf2a707728bc3101.tar.gz qemu-a06d5cc20b574e24630d9e59bf2a707728bc3101.tar.bz2 | |
qemu-iotests: Filter out DOS line endings
This one makes it possible to run qemu-iotests on a Windows build using Wine
and get somewhat meaningful results.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
| -rw-r--r-- | tests/qemu-iotests/common.filter | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index da77ede2..fa26b62 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -140,10 +140,16 @@ _filter_imgfmt() sed -e "s#$IMGFMT#IMGFMT#g" } +# Removes \r from messages +_filter_win32() +{ + sed -e 's/\r//g' +} + # sanitize qemu-io output _filter_qemu_io() { - 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)/" + _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)/" } # make sure this script returns success |