From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [OSSTEST PATCH 4/4] cs-bisection-step: Properly
 handle external job refs in template
Date: Fri, 4 Sep 2015 12:02:56 +0100
Message-ID: <1441364576.26292.479.camel@citrix.com>
References: <1441364168-24480-1-git-send-email-ian.jackson@eu.citrix.com>
	<1441364168-24480-5-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: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=6823cdc95=Ian.Campbell@citrix.com>)
	id 1ZXomE-0006GY-BT
	for xen-devel@lists.xenproject.org; Fri, 04 Sep 2015 11:03:26 +0000
In-Reply-To: <1441364168-24480-5-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Jackson <ian.jackson@eu.citrix.com>, xen-devel@lists.xenproject.org
List-Id: xen-devel@lists.xenproject.org

On Fri, 2015-09-04 at 11:56 +0100, Ian Jackson wrote:
> cs-bisection-step has had, for a long time, code which is supposed to
> handle the situation where the template flight contains build job
> references to other flights.
> 
> However:
> 
>  - The regexp to spot these other-flight job reference runvars would
>    never match because it said \s where \S was probably intended (and
>    . would be better);
> 
>  - If it were to match, the flight and job arguments to the recursive
>    preparejob invocation were teh wrong way round.  preparejob takes

"teh"

Otherwise all 4 of these patches LGTM:
Acked-by: Ian Campbell <ian.campbell@citrix.com>

>    the job name first.
> 
> Fix these two bugs.  Now it does seem to work properly.
> 
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> ---
>  cs-bisection-step |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/cs-bisection-step b/cs-bisection-step
> index 37efbea..b676044 100755
> --- a/cs-bisection-step
> +++ b/cs-bisection-step
> @@ -1190,8 +1190,8 @@ END
>      foreach my $subjob (@$subjobs) {
>          my $target;
>          my $jobspec= $subjob->{val};
> -        if ($jobspec =~ m/^(\d+)\.(\s+)$/) {
> -            $target= preparejob($1, $2, 1);
> +        if ($jobspec =~ m/^(\d+)\.(.+)$/) {
> +            $target= preparejob($2, $1, 1);
>          } else {
>              $target= preparejob($jobspec, $copyflight, 1);
>          }