qemu-iotests: Filter out qemu-io prompt in 035
PATCH 1/1 qemu-iotests: Filter out qemu-io prompt in 035
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 <[email protected]> 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.
tests/qemu-iotests/035 +2 -1
@@ -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"
tests/qemu-iotests/035.out +2 -2
@@ -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)
Am 13.11.2013 um 13:40 hat Fam Zheng geschrieben:
Quoted 3 lines
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.
Quoted 24 lines
It is available as following branch, with one single commit:
https://github.com/famz/qemu.git 035-filter-qemu-ioThanks,
---8<---
Author: Fam Zheng <[email protected]> Date: Wed Nov 13 20:19:05 2013 +0800qemu-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 <[email protected]>tests/qemu-iotests/035 +0
-0
tests/qemu-iotests/035 function generate_requests() { · line 64
Quoted 6 lines
tests/qemu-iotests/035 +2
-1@@ -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
Quoted 34 lines · Kevin Wolf
Am 13.11.2013 um 13:40 hat Fam Zheng geschrieben:
Quoted 3 lines
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.
Quoted 26 lines
It is available as following branch, with one single commit:
https://github.com/famz/qemu.git 035-filter-qemu-ioThanks,
---8<---
Author: Fam Zheng <[email protected]> Date: Wed Nov 13 20:19:05 2013 +0800qemu-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 <[email protected]>tests/qemu-iotests/035 +0
-0@@ -60,7 +60,8 @@ function generate_requests() { }
Quoted 7 lines
tests/qemu-iotests/035 function generate_requests() { · line 64
Quoted 4 lines
tests/qemu-iotests/035 +2
-1generate_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_ioinstead?
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
Am 14.11.2013 um 02:43 hat Fam Zheng geschrieben:
Quoted 43 lines · Kevin Wolf
Quoted 34 lines
Am 13.11.2013 um 13:40 hat Fam Zheng geschrieben:
Quoted 3 lines
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.
Quoted 26 lines
It is available as following branch, with one single commit:
https://github.com/famz/qemu.git 035-filter-qemu-ioThanks,
---8<---
Author: Fam Zheng <[email protected]> Date: Wed Nov 13 20:19:05 2013 +0800qemu-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 <[email protected]>tests/qemu-iotests/035 +0
-0@@ -60,7 +60,8 @@ function generate_requests() { }Quoted 7 lines
tests/qemu-iotests/035 function generate_requests() { · line 64
Quoted 4 lines
tests/qemu-iotests/035 +2
-1generate_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_ioinstead?
Quoted 7 lines
Should be good to have but I'm a little scared about the number of affected lines:
$ git grep qemu-io\>\ *.out | wc -l 75542Which 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