From patchwork Fri Jul 31 11:38:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11694759 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C65C6722 for ; Fri, 31 Jul 2020 12:03:14 +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 AD09922BF3 for ; Fri, 31 Jul 2020 12:03:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD09922BF3 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 1k1Tjt-00027b-0S; Fri, 31 Jul 2020 12:02:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k1Tjr-00026u-HR for xen-devel@lists.xenproject.org; Fri, 31 Jul 2020 12:02:15 +0000 X-Inumbo-ID: ac328bec-d325-11ea-8e2b-bc764e2007e4 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ac328bec-d325-11ea-8e2b-bc764e2007e4; Fri, 31 Jul 2020 12:02:14 +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 1k1TN2-0001W4-LZ; Fri, 31 Jul 2020 12:38:40 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH v2 33/41] cs-bisection-step: Generalise qtxt_common_rev_ok Date: Fri, 31 Jul 2020 12:38:12 +0100 Message-Id: <20200731113820.5765-34-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200731113820.5765-1-ian.jackson@eu.citrix.com> References: <20200731113820.5765-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 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" * Make it into a subref which takes a $table argument. * Change the two references into function calls using the @{...} syntax * Move the definition earlier in the file No change to the generated query. Signed-off-by: Ian Jackson --- v2: New patch. --- cs-bisection-step | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cs-bisection-step b/cs-bisection-step index 9a0fee39..5d4e179e 100755 --- a/cs-bisection-step +++ b/cs-bisection-step @@ -182,6 +182,14 @@ END sub flight_rmap ($$) { my ($flight, $need_urls) = @_; + my $qtxt_common_rev_ok = sub { + my ($table) = @_; + [<do(<('rev') } ORDER by rev.name; @@ -262,7 +266,7 @@ $qtxt_common_tables CROSS JOIN tmp_build_info AS url WHERE -$qtxt_common_rev_condition +@{ $qtxt_common_rev_ok->('rev') } AND url.name LIKE E'tree\\_%' AND url.use = rev.use AND url.job = rev.job