From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2k0r-00033T-39 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 08:56:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2k0k-0003qH-Or for qemu-devel@nongnu.org; Wed, 29 Feb 2012 08:56:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2k0k-0003q2-Gk for qemu-devel@nongnu.org; Wed, 29 Feb 2012 08:56:06 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1TDu4Z1011665 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 29 Feb 2012 08:56:04 -0500 From: Kevin Wolf Date: Wed, 29 Feb 2012 14:59:33 +0100 Message-Id: <1330523973-14648-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] qemu-iotests: Filter out DOS line endings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com 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 --- 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