Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B284C433DF for ; Thu, 4 Jun 2020 12:45:23 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 261902064C for ; Thu, 4 Jun 2020 12:45:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 261902064C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jgpFD-0005XU-0d; Thu, 04 Jun 2020 12:45:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jgpFC-0005XL-C0 for xen-devel@lists.xenproject.org; Thu, 04 Jun 2020 12:45:14 +0000 X-Inumbo-ID: 371a3fa8-a661-11ea-9947-bc764e2007e4 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 371a3fa8-a661-11ea-9947-bc764e2007e4; Thu, 04 Jun 2020 12:45:05 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1jgpF3-0006vr-5i; Thu, 04 Jun 2020 13:45:05 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 3/4] cs-bisection-step: need_repro: Support $consider_parents Date: Thu, 4 Jun 2020 13:44:58 +0100 Message-Id: <20200604124459.18453-4-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200604124459.18453-1-ian.jackson@eu.citrix.com> References: <20200604124459.18453-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This flag tells need_repro to look at parent commits of the indicated rtuple node, as well as the node itself. We walk up the tree. If there are multiple parents, we stop; likewise if we find any rtuple which doesn't have the expected results. Signed-off-by: Ian Jackson --- cs-bisection-step | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/cs-bisection-step b/cs-bisection-step index 90e0601a..bc6fb794 100755 --- a/cs-bisection-step +++ b/cs-bisection-step @@ -822,13 +822,31 @@ sub need_repro_sequence ($$) { } } -sub need_repro ($$$) { - my ($st, $n, $what) = @_; +sub need_repro ($$$;$) { + my ($st, $n, $what, $consider_parents) = @_; return 1 if conflicted_warning($n, $what); my $fl= $n->{Flights} || []; my $xinfo=''; + if ($consider_parents) { + $fl = [ @$fl ]; + my $nloop = $n; + my $iters = 0; + for (;;) { + last unless @{ $nloop->{Parents} } == 1; + $nloop = $nloop->{Parents}[0]; + $iters++; + $xinfo = " (at ancestor ~$iters)"; + my @others = grep { $_->{Result} ne $st } @{ $nloop->{Flights} }; + if (@others) { + print STDERR + " For $what, parent search stopping at $nloop->{Rtuple}, results @others"; + } + push @$fl, @{ $nloop->{Flights} }; + } + } + foreach my $f (sort { $a->{Flight} <=> $b->{Flight} } @$fl) { next unless $f->{Flight} > $repro_lastflight; if ($f->{Result} ne $st) { -- 2.20.1