From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vgb1Z-00038b-VV for qemu-devel@nongnu.org; Wed, 13 Nov 2013 09:02:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vgb1V-0004AT-6E for qemu-devel@nongnu.org; Wed, 13 Nov 2013 09:02:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vgb1U-0004AJ-Vn for qemu-devel@nongnu.org; Wed, 13 Nov 2013 09:02:25 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rADE2Ofi002285 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Nov 2013 09:02:24 -0500 Date: Wed, 13 Nov 2013 15:02:27 +0100 From: Kevin Wolf Message-ID: <20131113140227.GE2633@dhcp-200-207.str.redhat.com> References: <52837334.2090305@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <52837334.2090305@redhat.com> Subject: Re: [Qemu-devel] [PATCH] qemu-iotests: Filter out qemu-io prompt in 035 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: qemu-devel@nongnu.org, Stefan Hajnoczi Am 13.11.2013 um 13:40 hat Fam Zheng geschrieben: > This change is manually copy&pasted into thunderbird. It has a super > long line to kill `git send-email`, and is wrapped by email > composer. So you need to pull to merge it. 'git send-email --no-validate' worked the last time I has something like this. > It is available as following branch, with one single commit: > > https://github.com/famz/qemu.git 035-filter-qemu-io > > Thanks, > > ---8<--- > > Author: Fam Zheng > Date: Wed Nov 13 20:19:05 2013 +0800 > > qemu-iotests: Filter out qemu-io prompt in 035 > > The order of "qemu-io> " and "wrote 512/512 bytes at offset XXX" output > are indeterminic because of the parallism. Filter out the prompt will > eliminate some variability. > > Signed-off-by: Fam Zheng > > diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 > index ebe9b8c..95b0ce8 100755 > --- a/tests/qemu-iotests/035 > +++ b/tests/qemu-iotests/035 > @@ -60,7 +60,8 @@ function generate_requests() { > } > > generate_requests | $QEMU_IO "$TEST_IMG" | _filter_qemu_io |\ > - sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g' > + sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g' |\ > + sed -e 's/qemu-io> //g' How about including the new filter in _filter_qemu_io instead? Kevin