From: Kevin Wolf Date: Fri, 1 Oct 2010 04:02:28 +0000 (+0200) Subject: qemu-iotests: consider more cases in parsing qemu-io output X-Git-Tag: v2.7.1~5399^2^2~19 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=72bb202583ad71f3e9e0c03a0c9a3baa0db16494;p=mirror_qemu.git qemu-iotests: consider more cases in parsing qemu-io output I got a bug report with test output diffs like this: -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +4 KiB, 1 ops; 0.0000 sec (inf EiB/sec and inf ops/sec) This patch extends the regular expression to consider terabytes, petabytes and exabytes, and to allow inf as value for the throughput. Signed-off-by: Kevin Wolf Signed-off-by: Christoph Hellwig --- diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index ce81266ef7..da55f545a5 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -137,7 +137,7 @@ _filter_testdir() # sanitize qemu-io output _filter_qemu_io() { - sed -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.]* [GMKiBbytes]*\/sec and [0-9/.]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" + 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)/" } # make sure this script returns success