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 <f...@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 <f...@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
