From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vgw0U-00086H-Nk for qemu-devel@nongnu.org; Thu, 14 Nov 2013 07:26:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vgw0P-0004cU-V4 for qemu-devel@nongnu.org; Thu, 14 Nov 2013 07:26:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vgw0P-0004aV-Lk for qemu-devel@nongnu.org; Thu, 14 Nov 2013 07:26:41 -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 rAECQe9T010796 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Nov 2013 07:26:40 -0500 Date: Thu, 14 Nov 2013 13:26:37 +0100 From: Kevin Wolf Message-ID: <20131114122637.GE9755@dhcp-200-207.str.redhat.com> References: <52837334.2090305@redhat.com> <20131113140227.GE2633@dhcp-200-207.str.redhat.com> <52842AB3.6020901@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <52842AB3.6020901@redhat.com> Content-Transfer-Encoding: quoted-printable 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 14.11.2013 um 02:43 hat Fam Zheng geschrieben: > On 2013=E5=B9=B411=E6=9C=8813=E6=97=A5 22:02, Kevin Wolf wrote: > >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 li= ke > >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? > > >=20 > Should be good to have but I'm a little scared about the number of > affected lines: >=20 > $ git grep qemu-io\>\ *.out | wc -l > 75542 >=20 > Which all need to be in a single patch. Such is life... I don't think being scared of a large patch is a good argument for not making a change that we feel would be good to make. Kevin