qemu-iotests: 067: ignore QMP events

[qemu.git] / tests / qemu-iotests / 067

diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index 3788534d67ad5d5403e2b3deb0faf8c99cd708ef..77dec0d1fc88e76a37955ab70e781cc92d0951a7 100755 (executable)
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -45,11 +45,20 @@ function do_run_qemu()
     echo
 }
 
     echo
 }
 

+# Remove QMP events from (pretty-printed) output. Doesn't handle
+# nested dicts correctly, but we don't get any of those in this test.
+_filter_qmp_events()
+{
+    tr '\n' '\t' | sed -e \
+       's/{\s*"timestamp":\s*{[^}]*},\s*"event":[^,}]*\(,\s*"data":\s*{[^}]*}\)\?\s*}\s*//g' \
+       | tr '\t' '\n'
+}
+

 function run_qemu()
 {
     do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
                           | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' \
 function run_qemu()
 {
     do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
                           | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' \

-                          | _filter_generated_node_ids
+                          | _filter_generated_node_ids | _filter_qmp_events

 }
 
 size=128M
 }
 
 size=128M