On 2014-11-14 at 10:02, Max Reitz wrote:
_filter_qmp should be able to correctly filter out the QMP version
object for pretty JSON output.
Signed-off-by: Max Reitz <mre...@redhat.com>
---
tests/qemu-iotests/common.filter | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index 3acdb30..63d15b3 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -165,9 +165,12 @@ _filter_qemu()
# replace problematic QMP output like timestamps
_filter_qmp()
{
+ discard=0
+
Urgh, self-NACK. We don't need that anymore.
Max
_filter_win32 | \
sed -e 's#\("\(micro\)\?seconds": \)[0-9]\+#\1 TIMESTAMP#g' \
- -e 's#^{"QMP":.*}$#QMP_VERSION#'
+ -e 's#^{"QMP":.*}$#QMP_VERSION#' \
+ -e '/^ "QMP": {\s*$/, /^ }\s*$/ c\ QMP_VERSION'
}
# replace driver-specific options in the "Formatting..." line
