From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFK-00061q-9I for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2lFC-0003f3-AW for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFC-0003dG-2U for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:06 -0500 From: Kevin Wolf Date: Wed, 29 Feb 2012 16:18:03 +0100 Message-Id: <1330528688-21996-23-git-send-email-kwolf@redhat.com> In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com> References: <1330528688-21996-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 22/27] qemu-iotests: Filter out DOS line endings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 Reviewed-by: Stefan Hajnoczi --- 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 da77ede..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 -- 1.7.6.5