From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLZid-0005it-7H for qemu-devel@nongnu.org; Wed, 11 Feb 2015 11:00:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLZiV-0002zw-I8 for qemu-devel@nongnu.org; Wed, 11 Feb 2015 11:00:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37285) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLZiV-0002z1-3q for qemu-devel@nongnu.org; Wed, 11 Feb 2015 11:00:43 -0500 Message-ID: <54DB7CA5.5000004@redhat.com> Date: Wed, 11 Feb 2015 11:00:37 -0500 From: Max Reitz MIME-Version: 1.0 References: <1423651057-16204-1-git-send-email-chenxg@linux.vnet.ibm.com> <1423651057-16204-6-git-send-email-chenxg@linux.vnet.ibm.com> In-Reply-To: <1423651057-16204-6-git-send-email-chenxg@linux.vnet.ibm.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH RFC v6 5/5] qemu-iotests: s390x: fix test 051 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Xiao Guang Chen , qemu-devel@nongnu.org Cc: kwolf@redhat.com, mimu@linux.vnet.ibm.com, armbru@redhat.com 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 > Reviewed-by: Michael Mueller > Signed-off-by: Xiao Guang Chen > --- > 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' \