From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [OSSTEST PATCH] sg-report-flight: Fix --include (broken by 3d56a191) Date: Fri, 3 Jul 2015 11:30:55 +0100 Message-ID: <1435919455.9447.69.camel@citrix.com> References: <1435919008-16407-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZAyFI-0005r1-FS for xen-devel@lists.xenproject.org; Fri, 03 Jul 2015 10:31:00 +0000 In-Reply-To: <1435919008-16407-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Jackson Cc: xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org On Fri, 2015-07-03 at 11:23 +0100, Ian Jackson wrote: > In 3d56a191 "sg-report-flight: Make bodyprint[f] defer the output" it > became wrong for anything in the main printout part of > sg-report-flight to write directly to STDOUT. However, the two (very > similar) bits of code for handling the two kinds of --include still > used cat. > > The result is emails looking like this: > > From: osstest service owner > To: , > CC: > Subject: [rumpuserxen test] People who touched revisions under test: > Alice Bob > Ian Jackson > Carol David > Date: Fri, 3 Jul 2015 06:50:53 +0000 > > flight 59037 rumpuserxen real [real] > > Fix this by replacing those two near-identical bits of code with calls > to a single function which slurps the required include file into the > body text accumulation variable. > > (There is no need to provide a facility for header includes, since > there is no need for a caller to pass headers through > sg-report-flight: they can simply be written into the output file > before running sg-report-flight, as indeed the string `Subject: ' is. > > Despite the fact that --include-begin is used only by cr-daily-branch > which passes it a file `heading', the text is intended for the start > of the body, not the email headers.) > > I have run > > ./sg-report-flight --include-begin=header --include=bodyinc --this-xen=e13013dbf1d5997915548a3b5f1c39594d8c1d7b --that-xen=84066dd4ef4bb5983e246c629a26ef4f3394e5d5 --html-dir=$HOME/public_html/d --max-flight=37590 37590 > > with some suitable lorem ipsum in bodyinc and header and observed: > > (a) The bug introduced in 3d56a191 is visible in 3c464fbf. > > (b) The output after this patch differs from the output produced by > 1f0c168d (the previous osstest production commit) only in addition of > the `Last test of basis' and `Testing same since' information, in the > appropriate place. > > Deployment note: Because this patch changes only sg-report-flight, it > is safe to deploy under the feet of a running flight. I intend to do > this for all the production branches in the colo. > > Signed-off-by: Ian Jackson Acked-by: Ian Campbell