* [Qemu-devel] [PATCH] qemu-iotests: Filter out qemu-io prompt in 035
@ 2013-11-13 12:40 Fam Zheng
2013-11-13 14:02 ` Kevin Wolf
0 siblings, 1 reply; 4+ messages in thread
From: Fam Zheng @ 2013-11-13 12:40 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Stefan Hajnoczi
This change is manually copy&pasted into thunderbird. It has a super
long line to kill `git send-email`, and is wrapped by email composer. So
you need to pull to merge it.
It is available as following branch, with one single commit:
https://github.com/famz/qemu.git 035-filter-qemu-io
Thanks,
---8<---
Author: Fam Zheng <famz@redhat.com>
Date: Wed Nov 13 20:19:05 2013 +0800
qemu-iotests: Filter out qemu-io prompt in 035
The order of "qemu-io> " and "wrote 512/512 bytes at offset XXX" output
are indeterminic because of the parallism. Filter out the prompt will
eliminate some variability.
Signed-off-by: Fam Zheng <famz@redhat.com>
diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
index ebe9b8c..95b0ce8 100755
--- a/tests/qemu-iotests/035
+++ b/tests/qemu-iotests/035
@@ -60,7 +60,8 @@ function generate_requests() {
}
generate_requests | $QEMU_IO "$TEST_IMG" | _filter_qemu_io |\
- sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g'
+ sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g' |\
+ sed -e 's/qemu-io> //g'
echo
echo "checking image for errors"
diff --git a/tests/qemu-iotests/035.out b/tests/qemu-iotests/035.out
index 0c2279f..dd3bd20 100644
--- a/tests/qemu-iotests/035.out
+++ b/tests/qemu-iotests/035.out
@@ -1,8 +1,8 @@
QA output created by 035
creating image
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944
-qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io>
qemu-io> wrote 512/512 bytes at offset XXX
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944
+wrote 512/512 bytes at offset XXX
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 512/512 bytes at offset XXX
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] qemu-iotests: Filter out qemu-io prompt in 035
2013-11-13 12:40 [Qemu-devel] [PATCH] qemu-iotests: Filter out qemu-io prompt in 035 Fam Zheng
@ 2013-11-13 14:02 ` Kevin Wolf
2013-11-14 1:43 ` Fam Zheng
0 siblings, 1 reply; 4+ messages in thread
From: Kevin Wolf @ 2013-11-13 14:02 UTC (permalink / raw)
To: Fam Zheng; +Cc: qemu-devel, Stefan Hajnoczi
Am 13.11.2013 um 13:40 hat Fam Zheng geschrieben:
> This change is manually copy&pasted into thunderbird. It has a super
> long line to kill `git send-email`, and is wrapped by email
> composer. So you need to pull to merge it.
'git send-email --no-validate' worked the last time I has something like
this.
> It is available as following branch, with one single commit:
>
> https://github.com/famz/qemu.git 035-filter-qemu-io
>
> Thanks,
>
> ---8<---
>
> Author: Fam Zheng <famz@redhat.com>
> Date: Wed Nov 13 20:19:05 2013 +0800
>
> qemu-iotests: Filter out qemu-io prompt in 035
>
> The order of "qemu-io> " and "wrote 512/512 bytes at offset XXX" output
> are indeterminic because of the parallism. Filter out the prompt will
> eliminate some variability.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
>
> diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
> index ebe9b8c..95b0ce8 100755
> --- a/tests/qemu-iotests/035
> +++ b/tests/qemu-iotests/035
> @@ -60,7 +60,8 @@ function generate_requests() {
> }
>
> generate_requests | $QEMU_IO "$TEST_IMG" | _filter_qemu_io |\
> - sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g'
> + sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g' |\
> + sed -e 's/qemu-io> //g'
How about including the new filter in _filter_qemu_io instead?
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] qemu-iotests: Filter out qemu-io prompt in 035
2013-11-13 14:02 ` Kevin Wolf
@ 2013-11-14 1:43 ` Fam Zheng
2013-11-14 12:26 ` Kevin Wolf
0 siblings, 1 reply; 4+ messages in thread
From: Fam Zheng @ 2013-11-14 1:43 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel, Stefan Hajnoczi
On 2013年11月13日 22:02, Kevin Wolf wrote:
> Am 13.11.2013 um 13:40 hat Fam Zheng geschrieben:
>> This change is manually copy&pasted into thunderbird. It has a super
>> long line to kill `git send-email`, and is wrapped by email
>> composer. So you need to pull to merge it.
>
> 'git send-email --no-validate' worked the last time I has something like
> this.
>
>> It is available as following branch, with one single commit:
>>
>> https://github.com/famz/qemu.git 035-filter-qemu-io
>>
>> Thanks,
>>
>> ---8<---
>>
>> Author: Fam Zheng <famz@redhat.com>
>> Date: Wed Nov 13 20:19:05 2013 +0800
>>
>> qemu-iotests: Filter out qemu-io prompt in 035
>>
>> The order of "qemu-io> " and "wrote 512/512 bytes at offset XXX" output
>> are indeterminic because of the parallism. Filter out the prompt will
>> eliminate some variability.
>>
>> Signed-off-by: Fam Zheng <famz@redhat.com>
>>
>> diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
>> index ebe9b8c..95b0ce8 100755
>> --- a/tests/qemu-iotests/035
>> +++ b/tests/qemu-iotests/035
>> @@ -60,7 +60,8 @@ function generate_requests() {
>> }
>>
>> generate_requests | $QEMU_IO "$TEST_IMG" | _filter_qemu_io |\
>> - sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g'
>> + sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g' |\
>> + sed -e 's/qemu-io> //g'
>
> How about including the new filter in _filter_qemu_io instead?
>
Should be good to have but I'm a little scared about the number of
affected lines:
$ git grep qemu-io\>\ *.out | wc -l
75542
Which all need to be in a single patch.
Fam
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] qemu-iotests: Filter out qemu-io prompt in 035
2013-11-14 1:43 ` Fam Zheng
@ 2013-11-14 12:26 ` Kevin Wolf
0 siblings, 0 replies; 4+ messages in thread
From: Kevin Wolf @ 2013-11-14 12:26 UTC (permalink / raw)
To: Fam Zheng; +Cc: qemu-devel, Stefan Hajnoczi
Am 14.11.2013 um 02:43 hat Fam Zheng geschrieben:
> On 2013年11月13日 22:02, Kevin Wolf wrote:
> >Am 13.11.2013 um 13:40 hat Fam Zheng geschrieben:
> >>This change is manually copy&pasted into thunderbird. It has a super
> >>long line to kill `git send-email`, and is wrapped by email
> >>composer. So you need to pull to merge it.
> >
> >'git send-email --no-validate' worked the last time I has something like
> >this.
> >
> >>It is available as following branch, with one single commit:
> >>
> >> https://github.com/famz/qemu.git 035-filter-qemu-io
> >>
> >>Thanks,
> >>
> >>---8<---
> >>
> >>Author: Fam Zheng <famz@redhat.com>
> >>Date: Wed Nov 13 20:19:05 2013 +0800
> >>
> >> qemu-iotests: Filter out qemu-io prompt in 035
> >>
> >> The order of "qemu-io> " and "wrote 512/512 bytes at offset XXX" output
> >> are indeterminic because of the parallism. Filter out the prompt will
> >> eliminate some variability.
> >>
> >> Signed-off-by: Fam Zheng <famz@redhat.com>
> >>
> >>diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
> >>index ebe9b8c..95b0ce8 100755
> >>--- a/tests/qemu-iotests/035
> >>+++ b/tests/qemu-iotests/035
> >>@@ -60,7 +60,8 @@ function generate_requests() {
> >> }
> >>
> >> generate_requests | $QEMU_IO "$TEST_IMG" | _filter_qemu_io |\
> >>- sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g'
> >>+ sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g' |\
> >>+ sed -e 's/qemu-io> //g'
> >
> >How about including the new filter in _filter_qemu_io instead?
> >
>
> Should be good to have but I'm a little scared about the number of
> affected lines:
>
> $ git grep qemu-io\>\ *.out | wc -l
> 75542
>
> Which all need to be in a single patch.
Such is life...
I don't think being scared of a large patch is a good argument for not
making a change that we feel would be good to make.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-14 12:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-13 12:40 [Qemu-devel] [PATCH] qemu-iotests: Filter out qemu-io prompt in 035 Fam Zheng
2013-11-13 14:02 ` Kevin Wolf
2013-11-14 1:43 ` Fam Zheng
2013-11-14 12:26 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).