[Qemu-devel] [PATCH] qemu-iotests: Filter out DOS line endings

[Qemu-devel] [PATCH] qemu-iotests: Filter out DOS line endings

[Kevin Wolf]

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>
---
 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

Re: [Qemu-devel] [PATCH] qemu-iotests: Filter out DOS line endings

[Stefan Hajnoczi]

On Wed, Feb 29, 2012 at 1:59 PM, Kevin Wolf <kwolf@redhat.com> wrote:
> 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>
> ---
>  tests/qemu-iotests/common.filter |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)

This and the other two qemu-iotests patches you posted along with it:

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Re: [Qemu-devel] [PATCH] qemu-iotests: Filter out DOS line endings

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1135 bytes --]

On 02/29/2012 06:59 AM, Kevin Wolf wrote:
> 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>
> ---
>  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'

POSIX does not require sed to recognize \r as a synonym for carriage
return.  You are better off using tr(1) (tr -d '\r') if all you want to
do is strip carriage returns in a POSIX-compliant manner.  Also be aware
that on Solaris, you have to make sure you are using a PATH that first
finds a POSIX-compliant tr.

-- 
Eric Blake   eblake@redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 620 bytes --]

Re: [Qemu-devel] [PATCH] qemu-iotests: Filter out DOS line endings

[Kevin Wolf]

Am 29.02.2012 18:32, schrieb Eric Blake:
> On 02/29/2012 06:59 AM, Kevin Wolf wrote:
>> 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>
>> ---
>>  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'
> 
> POSIX does not require sed to recognize \r as a synonym for carriage
> return.  You are better off using tr(1) (tr -d '\r') if all you want to
> do is strip carriage returns in a POSIX-compliant manner.  Also be aware
> that on Solaris, you have to make sure you are using a PATH that first
> finds a POSIX-compliant tr.

But who will run qemu-iotests on Wine on Solaris? Running it on Wine on
Linux is already crazy enough. IIUC the sed call won't break anything,
it may just not work and won't strip out the carriage returns. Well, bad
luck, try a sane setup instead.

(I would see it different if this was ./configure, but it is a test case
output filter)

Kevin

Re: [Qemu-devel] [PATCH] qemu-iotests: Filter out DOS line endings

[Paolo Bonzini]

Il 01/03/2012 10:09, Kevin Wolf ha scritto:
> But who will run qemu-iotests on Wine on Solaris? Running it on Wine on
> Linux is already crazy enough. IIUC the sed call won't break anything,
> it may just not work and won't strip out the carriage returns. Well, bad
> luck, try a sane setup instead.

It would strip "r"s.  I also suggest using tr.

Paolo