From patchwork Wed Jan 22 09:54:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 23501 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1F348218DC for ; Wed, 22 Jan 2014 10:35:41 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id lf12sf301969vcb.5 for ; Wed, 22 Jan 2014 02:35:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=k/Qqmg+0eZpnHRVAqmBuCnV+gLlIE7kYmbaPbT4zfao=; b=SJfmSgJUVBV/rbMTqzSrOPSAmmhAVXY+L8oUMbbWI3PIIrS4Voch8yQLkrSkosm/rb hwge40LhCzZkpzbOR1IjCaSW49tuBRY6idci12wkf9eaTTyLpbKETZXWULon7roWClHr 4qLY7fPocs4fg9pVor4UacHtpc+kSNolwfkVtNOjYSBN7PUXiQc1JglQYjmxRNJ6vPFI GwD6OER0zoS6LRbqXJeL+Dpx2u9MFFRyGR9ZJpdCCGQ+WivHQXcKvHsvgSnJGsG/Blco llOrIz828HAtnCN2mUqTKK7jwo1wdqSa/xw88hQ0/9vcMGBKjk2RPqoWku2Hh4ckq3UH pdaA== X-Gm-Message-State: ALoCoQkOFDHb3VErrprUXXsKzBb2Bdff7Gt9Z0Fln2nhoSmjsAUthL3h8Ddm06rqPpXNayMEEnnJ X-Received: by 10.236.110.3 with SMTP id t3mr238308yhg.3.1390386940238; Wed, 22 Jan 2014 02:35:40 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.103.118 with SMTP id x109ls23384qge.43.gmail; Wed, 22 Jan 2014 02:35:40 -0800 (PST) X-Received: by 10.220.95.139 with SMTP id d11mr343858vcn.21.1390386940145; Wed, 22 Jan 2014 02:35:40 -0800 (PST) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id 6si4276589vcu.51.2014.01.22.02.35.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 02:35:40 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id oz11so110807veb.4 for ; Wed, 22 Jan 2014 02:35:40 -0800 (PST) X-Received: by 10.58.85.133 with SMTP id h5mr391620vez.4.1390386940023; Wed, 22 Jan 2014 02:35:40 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp175699vcz; Wed, 22 Jan 2014 02:35:39 -0800 (PST) X-Received: by 10.50.109.132 with SMTP id hs4mr22978900igb.34.1390386938132; Wed, 22 Jan 2014 02:35:38 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id fq9si13021756icc.17.2014.01.22.02.35.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 Jan 2014 02:35:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W5uWa-0006aJ-Ml; Wed, 22 Jan 2014 09:55:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W5uWZ-0006ZY-A1 for xen-devel@lists.xen.org; Wed, 22 Jan 2014 09:55:07 +0000 Received: from [85.158.143.35:31710] by server-1.bemta-4.messagelabs.com id 4D/19-02132-A759FD25; Wed, 22 Jan 2014 09:55:06 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1390384503!385!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25047 invoked from network); 22 Jan 2014 09:55:05 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 22 Jan 2014 09:55:05 -0000 X-IronPort-AV: E=Sophos;i="4.95,698,1384300800"; d="scan'208";a="95229979" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 22 Jan 2014 09:55:03 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.2.342.4; Wed, 22 Jan 2014 04:55:03 -0500 Received: from spare.cam.xci-test.com ([10.80.2.80] helo=kazak.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1W5uWU-0005Rs-Bf; Wed, 22 Jan 2014 09:55:02 +0000 From: Ian Campbell To: Date: Wed, 22 Jan 2014 09:54:54 +0000 Message-ID: <1390384501-20552-10-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390384419.32519.32.camel@kazak.uk.xensource.com> References: <1390384419.32519.32.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST 10/17] make-flight: refactor job_create_test filters X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This will allow job_create_test to be moved mfi-common. No (intentional) change to the set of jobs which are created. Signed-off-by: Ian Campbell --- make-flight | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/make-flight b/make-flight index 7085dc2..34c1ce4 100755 --- a/make-flight +++ b/make-flight @@ -47,7 +47,38 @@ else fi +job_create_test_filter_callback () { + local job=$1; shift + local recipe=$1; shift + local toolstack=$1; shift + local xenarch=$1; shift + local dom0arch=$1; shift + + case "$branch" in + qemu-upstream-*) + case " $* " in + *" device_model_version=qemu-xen "*) + ;; + *) + : "suppressed $job" + return 1;; + esac + ;; + *) + case "$job" in + *-qemuu-*) + if [ "x$toolstack" != xxl ]; then return 1; fi + ;; + esac + ;; + esac + + return 0; +} + job_create_test () { + job_create_test_filter_callback "$@" || return 0 + local job=$1; shift local recipe=$1; shift local toolstack=$1; shift @@ -68,25 +99,6 @@ job_create_test () { ;; esac - case "$branch" in - qemu-upstream-*) - case " $* " in - *" device_model_version=qemu-xen "*) - ;; - *) - : "suppressed $job" - return;; - esac - ;; - *) - case "$job" in - *-qemuu-*) - if [ "x$toolstack" != xxl ]; then return; fi - ;; - esac - ;; - esac - ./cs-job-create $flight $job $recipe toolstack=$toolstack \ $RUNVARS $TEST_RUNVARS $most_runvars \ xenbuildjob=$xenbuildjob buildjob=$buildjob "$@"