|
From: | Max Reitz |
Subject: | Re: [Qemu-devel] [PATCH RFC v6 5/5] qemu-iotests: s390x: fix test 051 |
Date: | Wed, 11 Feb 2015 11:00:37 -0500 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 |
On 2015-02-11 at 05:37, Xiao Guang Chen wrote:
The tests for device type "ide_cd" should only be tested for the pc platform. The default device id of hard disk on the s390 platform differs to that of the x86 platform. A new variable device_id is defined and "virtio0" set for the s390 platform. A x86 platform specific output file is also needed. A new filter was added to filter orphan warnings. Reviewed-by: Max Reitz <address@hidden> Reviewed-by: Michael Mueller <address@hidden> Signed-off-by: Xiao Guang Chen <address@hidden> --- tests/qemu-iotests/051 | 79 +++++--- tests/qemu-iotests/051.out | 175 ++++++---------- tests/qemu-iotests/051.pc.out | 427 +++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/common.filter | 7 + 4 files changed, 547 insertions(+), 141 deletions(-) create mode 100644 tests/qemu-iotests/051.pc.out
[snip]
+# removes orphan warnings +_filter_orphan() +{ + sed -e 's/Warning: Orphaned drive without device:.*$//g'
Well, the problem with this is that it does not remove the newline introduced by the warning, so it's still a different output then if the warning had not been emitted at all.
But as I said in my review for v5, as long as it works on x86 and s390, I'm fine with it, so my R-b stands.
Max
+} + # replace occurrences of QEMU_PROG with "qemu" _filter_qemu() { + _filter_orphan | \ sed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" \ -e 's#^QEMU [0-9]\+\.[0-9]\+\.[0-9]\+ monitor#QEMU X.Y.Z monitor#' \ -e '/main-loop: WARNING: I\/O thread spun for [0-9]\+ iterations/d' \
[Prev in Thread] | Current Thread | [Next in Thread] |