[Qemu-devel] [PATCH] qemu-iotests: Filter out qemu-io prompt in 035

[Fam Zheng]

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 <address@hidden>
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 <address@hidden>

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)