[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] iotests: _filter_qmp for pretty JSON output
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 2/3] iotests: _filter_qmp for pretty JSON output |
Date: |
Tue, 11 Nov 2014 14:34:32 +0100 |
_filter_qmp should be able to correctly filter out the QMP version
object for pretty JSON output.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/common.filter | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index 3acdb30..e24dab4 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -165,9 +165,23 @@ _filter_qemu()
# replace problematic QMP output like timestamps
_filter_qmp()
{
+ discard=0
+
_filter_win32 | \
sed -e 's#\("\(micro\)\?seconds": \)[0-9]\+#\1 TIMESTAMP#g' \
- -e 's#^{"QMP":.*}$#QMP_VERSION#'
+ -e 's#^{"QMP":.*}$#QMP_VERSION#' \
+ -e 's#\\#\\\\#g' | \
+ while IFS='' read line; do
+ if [[ $line == ' "QMP": {' ]]; then
+ discard=1
+ echo ' QMP_VERSION'
+ fi
+ if [[ $discard == 0 ]]; then
+ echo "$line"
+ elif [[ $discard == 1 && $line == ' }' ]]; then
+ discard=0
+ fi
+ done
}
# replace driver-specific options in the "Formatting..." line
--
1.9.3