From patchwork Wed Jan 22 09:54:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 23500 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 71989218E2 for ; Wed, 22 Jan 2014 10:34:50 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id f11sf293566qae.3 for ; Wed, 22 Jan 2014 02:34:49 -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=YxSo6jDVwo/vEyxRTvCaF7PmGef+gP8AT/N9k7zKK/U=; b=Uf7fYiUFqIrExGgo20xueDWoYbtPMZV643imWpBWLlRxqQwh35osZ5hwnxwSyRPBq4 5CsgzVmYb+UZVggJix5sTEMQdPBtU3NQHIbxU2Sd2VDNb5P2N/45xcDZnYTflzqZ+Jhn pUjKzZtna3qLX5uKtJ2jLG0rhudtr1oiStv/UnKsxJM4HdIt1ILxdt4pvcvWxb5pf2mG PEJuXNqmYcYNqdQZKjjOtR6SCmVPKvLfnC2hRgtCpCC66s7IpVlayKXjlW3GSf9XWNE1 MXLxgb4DB0kljkl8vYF5TzL+EPYZfUFnGtMGNBismlp/5qC7GA46zETUMejPaNK19+67 eQaw== X-Gm-Message-State: ALoCoQlo1mp3zPbbfQV71ePEpyHH3JFl0Fny3bM5fLajbcKCev+ft6ZbyxeKCRUZ76sI3aXW/71g X-Received: by 10.58.145.233 with SMTP id sx9mr305069veb.0.1390386889712; Wed, 22 Jan 2014 02:34:49 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.167 with SMTP id dd7ls37071qeb.81.gmail; Wed, 22 Jan 2014 02:34:49 -0800 (PST) X-Received: by 10.220.58.202 with SMTP id i10mr340859vch.23.1390386889620; Wed, 22 Jan 2014 02:34:49 -0800 (PST) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id dd4si4271394vcb.70.2014.01.22.02.34.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 02:34:49 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ia6so103559vcb.24 for ; Wed, 22 Jan 2014 02:34:49 -0800 (PST) X-Received: by 10.58.6.239 with SMTP id e15mr388442vea.14.1390386889525; Wed, 22 Jan 2014 02:34:49 -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 u4csp175636vcz; Wed, 22 Jan 2014 02:34:49 -0800 (PST) X-Received: by 10.50.29.65 with SMTP id i1mr2181066igh.39.1390386888407; Wed, 22 Jan 2014 02:34:48 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id ih5si13014101icb.23.2014.01.22.02.34.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 Jan 2014 02:34:48 -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 1W5uWs-00072R-It; Wed, 22 Jan 2014 09:55:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W5uWq-0006yH-A6 for xen-devel@lists.xen.org; Wed, 22 Jan 2014 09:55:24 +0000 Received: from [85.158.137.68:10053] by server-11.bemta-3.messagelabs.com id B5/5A-19379-8859FD25; Wed, 22 Jan 2014 09:55:20 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1390384518!10600155!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32320 invoked from network); 22 Jan 2014 09:55:19 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 22 Jan 2014 09:55:19 -0000 X-IronPort-AV: E=Sophos;i="4.95,698,1384300800"; d="scan'208";a="93181367" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 22 Jan 2014 09:55:18 +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:17 -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-E1; Wed, 22 Jan 2014 09:55:02 +0000 From: Ian Campbell To: Date: Wed, 22 Jan 2014 09:54:55 +0000 Message-ID: <1390384501-20552-11-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: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST 11/17] make-flight: refactor job_create_test into mfi-common 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.220.179 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: Now that it uses a callback it can trivially be moved to mfi-common Arguably the setting of *buildjob could also be a callback, but my intended use case doesn't need that and it seems reasonable enough for now that users of the common job_create_test also use the common create_build_jobs (or produce something sufficiently similar). Signed-off-by: Ian Campbell --- make-flight | 28 ---------------------------- mfi-common | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/make-flight b/make-flight index 34c1ce4..8862be5 100755 --- a/make-flight +++ b/make-flight @@ -76,34 +76,6 @@ job_create_test_filter_callback () { return 0; } -job_create_test () { - job_create_test_filter_callback "$@" || return 0 - - local job=$1; shift - local recipe=$1; shift - local toolstack=$1; shift - local xenarch=$1; shift - local dom0arch=$1; shift - - xenbuildjob="${bfi}build-$xenarch" - buildjob="${bfi}build-$dom0arch" - - case "$xenbranch:$toolstack" in - xen-3.*-testing:*) ;; - xen-4.0-testing:*) ;; - xen-4.1-testing:*) ;; - xen-4.2-testing:*) ;; - xen-4.3-testing:*) ;; - *:xend) xenbuildjob="$xenbuildjob-xend" - buildjob="${bfi}build-$dom0arch-xend" - ;; - esac - - ./cs-job-create $flight $job $recipe toolstack=$toolstack \ - $RUNVARS $TEST_RUNVARS $most_runvars \ - xenbuildjob=$xenbuildjob buildjob=$buildjob "$@" -} - for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do if [ "x$xenarch" = xdisable ]; then continue; fi diff --git a/mfi-common b/mfi-common index e7cae0a..373110b 100644 --- a/mfi-common +++ b/mfi-common @@ -189,6 +189,34 @@ create_build_jobs () { done } +job_create_test () { + job_create_test_filter_callback "$@" || return 0 + + local job=$1; shift + local recipe=$1; shift + local toolstack=$1; shift + local xenarch=$1; shift + local dom0arch=$1; shift + + xenbuildjob="${bfi}build-$xenarch" + buildjob="${bfi}build-$dom0arch" + + case "$xenbranch:$toolstack" in + xen-3.*-testing:*) ;; + xen-4.0-testing:*) ;; + xen-4.1-testing:*) ;; + xen-4.2-testing:*) ;; + xen-4.3-testing:*) ;; + *:xend) xenbuildjob="$xenbuildjob-xend" + buildjob="${bfi}build-$dom0arch-xend" + ;; + esac + + ./cs-job-create $flight $job $recipe toolstack=$toolstack \ + $RUNVARS $TEST_RUNVARS $most_runvars \ + xenbuildjob=$xenbuildjob buildjob=$buildjob "$@" +} + # Local variables: # mode: sh # sh-basic-offset: 2