| Message ID | 1384914356-14231-3-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 11/19/2013 07:25 PM, Fam Zheng wrote: > This removes "qemu-io> " prompt from qemu-io output in _filter_qemu_io, > and updates all the output files with the following command: > > cd tests/qemu-iotests && sed -i "s/qemu-io> //g" *.out > > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > > This patch is snipped because the size would be rejected by list. See cover letter for the address to pull. Thanks for the updated commit message; and I did indeed verify that the sed you listed gives the same results in my tree as the one I fetched from your cover letter. Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 8e7b1a4..9c82c77 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)/" \ + -e "s/qemu-io> //g" } # replace occurrences of QEMU_PROG with "qemu"
This removes "qemu-io> " prompt from qemu-io output in _filter_qemu_io, and updates all the output files with the following command: cd tests/qemu-iotests && sed -i "s/qemu-io> //g" *.out Signed-off-by: Fam Zheng <famz@redhat.com> --- This patch is snipped because the size would be rejected by list. See cover letter for the address to pull. --- 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.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 | 34 +- tests/qemu-iotests/common.filter | 3 +- 19 files changed, 75553 insertions(+), 75552 deletions(-) [snip]