[Qemu-devel] [PATCH 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Qemu-devel] [PATCH 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Fam Zheng]

Fam Zheng (2):
  qemu-iotests: Filter qemu-io output in 025
  qemu-iotests: Filter out 'qemu-io> ' prompt

 tests/qemu-iotests/013.out       | 44080 ++++++++++++-------------
 tests/qemu-iotests/014.out       | 64204 ++++++++++++++++++-------------------
 tests/qemu-iotests/017.out       |  1080 +-
 tests/qemu-iotests/018.out       |  1080 +-
 tests/qemu-iotests/019.out       |  1636 +-
 tests/qemu-iotests/020.out       |  1080 +-
 tests/qemu-iotests/022.out       |  8816 ++---
 tests/qemu-iotests/023.out       | 26800 ++++++++--------
 tests/qemu-iotests/024.out       |   164 +-
 tests/qemu-iotests/025           |     2 +-
 tests/qemu-iotests/025.out       |    18 +-
 tests/qemu-iotests/028.out       |   458 +-
 tests/qemu-iotests/032.out       |    68 +-
 tests/qemu-iotests/035.out       |     2 +-
 tests/qemu-iotests/037.out       |   616 +-
 tests/qemu-iotests/038.out       |   714 +-
 tests/qemu-iotests/046.out       |   232 +-
 tests/qemu-iotests/047.out       |    20 +-
 tests/qemu-iotests/048.out       |    18 +-
 tests/qemu-iotests/common.filter |     3 +-
 20 files changed, 75546 insertions(+), 75545 deletions(-)

-- 
1.8.4.2

[Qemu-devel] [PATCH 1/2] qemu-iotests: Filter qemu-io output in 025

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/025 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
index a7241cc..9426c93 100755
--- a/tests/qemu-iotests/025
+++ b/tests/qemu-iotests/025
@@ -56,7 +56,7 @@ _check_test_img
 
 echo
 echo "=== Resizing image"
-$QEMU_IO "$TEST_IMG" <<EOF
+$QEMU_IO "$TEST_IMG" <<EOF | _filter_qemu_io
 length
 truncate $big_size
 length
-- 
1.8.4.2

Re: [Qemu-devel] [PATCH 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Fam Zheng]

The second patch is too big in size (over 10M), and rejected by list 
moderator.

You can PULL from git branch:

	https://github.com/famz/qemu.git 035-filter-qemu-io

On 2013年11月18日 15:21, Fam Zheng wrote:
> Fam Zheng (2):
>    qemu-iotests: Filter qemu-io output in 025
>    qemu-iotests: Filter out 'qemu-io> ' prompt
>
>   tests/qemu-iotests/013.out       | 44080 ++++++++++++-------------
>   tests/qemu-iotests/014.out       | 64204 ++++++++++++++++++-------------------
>   tests/qemu-iotests/017.out       |  1080 +-
>   tests/qemu-iotests/018.out       |  1080 +-
>   tests/qemu-iotests/019.out       |  1636 +-
>   tests/qemu-iotests/020.out       |  1080 +-
>   tests/qemu-iotests/022.out       |  8816 ++---
>   tests/qemu-iotests/023.out       | 26800 ++++++++--------
>   tests/qemu-iotests/024.out       |   164 +-
>   tests/qemu-iotests/025           |     2 +-
>   tests/qemu-iotests/025.out       |    18 +-
>   tests/qemu-iotests/028.out       |   458 +-
>   tests/qemu-iotests/032.out       |    68 +-
>   tests/qemu-iotests/035.out       |     2 +-
>   tests/qemu-iotests/037.out       |   616 +-
>   tests/qemu-iotests/038.out       |   714 +-
>   tests/qemu-iotests/046.out       |   232 +-
>   tests/qemu-iotests/047.out       |    20 +-
>   tests/qemu-iotests/048.out       |    18 +-
>   tests/qemu-iotests/common.filter |     3 +-
>   20 files changed, 75546 insertions(+), 75545 deletions(-)
>

Re: [Qemu-devel] [PATCH 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Eric Blake]

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

On 11/18/2013 11:50 PM, Fam Zheng wrote:
> The second patch is too big in size (over 10M), and rejected by list
> moderator.
> 
> You can PULL from git branch:
> 
>     https://github.com/famz/qemu.git 035-filter-qemu-io

I'm guessing the second patch consists of a tiny amount of code to turn
on the filter, while the majority of the patch was automated.  It would
be helpful to amend your commit message to show how you automated the
conversion (was it something like
  find tests/qemu-iotests -name "*.out" | \
  xargs -L1 sed -i "s/qemu-io> //g" '
?)

Given such a formula in the commit message itself, it would be much
easier to review the patch - check that both the non-automatic small
modification and the conversion formula make sense, then repeat the
conversion formula locally and compare it to your git tree to see that
the two results match, and that the testsuite still passes.  [Or in
other words, I don't plan on reading 10M of mindlessly repetitive
changes :) ]

>>   tests/qemu-iotests/common.filter |     3 +-
>>   20 files changed, 75546 insertions(+), 75545 deletions(-)

Looks like that's the one file with the nontrivial change.


diff --git a/tests/qemu-iotests/common.filter
b/tests/qemu-iotests/common.filter
index 8e7b1a4..0dd82e1 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -149,7 +149,8 @@ _filter_win32()
 # sanitize qemu-io output
 _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)/"
+    _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)/" |\
+        sed -e "s/qemu-io> //g"
 }

 # replace occurrences of QEMU_PROG with "qemu"


Question - why do you pipeline 'sed | sed'?  It should be sufficient to
just add the "s/qemu-io> //g" instruction into the existing sed
pipeline, for one fewer process per filter run.

-- 
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: 621 bytes --]

Re: [Qemu-devel] [PATCH 1/2] qemu-iotests: Filter qemu-io output in 025

[Eric Blake]

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

On 11/18/2013 12:21 AM, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/025 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
> index a7241cc..9426c93 100755
> --- a/tests/qemu-iotests/025
> +++ b/tests/qemu-iotests/025
> @@ -56,7 +56,7 @@ _check_test_img
>  
>  echo
>  echo "=== Resizing image"
> -$QEMU_IO "$TEST_IMG" <<EOF
> +$QEMU_IO "$TEST_IMG" <<EOF | _filter_qemu_io
>  length
>  truncate $big_size
>  length
> 

-- 
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: 621 bytes --]