From patchwork Tue Feb 11 13:31:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 24451 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CFE6D206FF for ; Tue, 11 Feb 2014 13:33:35 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id tp5sf26452036ieb.3 for ; Tue, 11 Feb 2014 05:33:35 -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 :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=1RvE+0aAgcxyPifK7dWuKmu84Ioqd5GtnKobcjr9/UQ=; b=BfUaRGzVl0+aY7dHulKeX5Uvn5jBCcqNNPEfx/aD9jZ62ndLDP9+LhW8+cUNuAbDKM KgTCH6LE6xOHBfQ9Y/vU2xuELGYNbErPIQc4PQcKgiaSF4tZYJzrfYqR4+Rw3wIxEus+ T6/rUZGv9vEHhyLQrhrmKoaNbE7c0sla3zkou2RX6a57vNQ5O4fjY5o+kGU/xEcUOySz cnoqXBzmB0/u4/NXNcX29qlroL5JDPqoPMyWIsqGR4Pk9vCmfrrPVXEDZ2505LiXYFmP oNpF0BU4LV0DghdrxCMyTkwjeR0j1FmtgSW0moR4seBV1GOY04DLuRYH2a9Qf0qhFBxO CrWw== X-Gm-Message-State: ALoCoQl7EtviQfcaByDQwm9niroaGkietZoJAz+l2BhZRCZgcBqGpIxrpHEuSd1fO2vWUSFxpqeN X-Received: by 10.42.240.19 with SMTP id ky19mr11907803icb.4.1392125615009; Tue, 11 Feb 2014 05:33:35 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.100 with SMTP id 91ls2434697qgi.18.gmail; Tue, 11 Feb 2014 05:33:34 -0800 (PST) X-Received: by 10.220.145.5 with SMTP id b5mr22801729vcv.9.1392125614846; Tue, 11 Feb 2014 05:33:34 -0800 (PST) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by mx.google.com with ESMTPS id y3si5883714vdo.97.2014.02.11.05.33.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 05:33:34 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.44 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.44; Received: by mail-vb0-f44.google.com with SMTP id f12so5911268vbg.31 for ; Tue, 11 Feb 2014 05:33:34 -0800 (PST) X-Received: by 10.58.170.106 with SMTP id al10mr62690vec.61.1392125614751; Tue, 11 Feb 2014 05:33:34 -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 u4csp246569vcz; Tue, 11 Feb 2014 05:33:34 -0800 (PST) X-Received: by 10.52.30.230 with SMTP id v6mr23806586vdh.6.1392125614364; Tue, 11 Feb 2014 05:33:34 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id dc20si5904902vec.42.2014.02.11.05.33.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Feb 2014 05:33:34 -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 1WDDRT-0008Fv-Ig; Tue, 11 Feb 2014 13:32:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDDRQ-0008Fc-E9 for xen-devel@lists.xen.org; Tue, 11 Feb 2014 13:32:00 +0000 Received: from [85.158.137.68:47922] by server-11.bemta-3.messagelabs.com id A5/1C-04255-F462AF25; Tue, 11 Feb 2014 13:31:59 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1392125517!1116840!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 29695 invoked from network); 11 Feb 2014 13:31:58 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 11 Feb 2014 13:31:58 -0000 X-IronPort-AV: E=Sophos;i="4.95,825,1384300800"; d="scan'208";a="99777518" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 11 Feb 2014 13:31:44 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 11 Feb 2014 08:31:43 -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 1WDDR9-0008K0-7q; Tue, 11 Feb 2014 13:31:43 +0000 From: Ian Campbell To: Date: Tue, 11 Feb 2014 13:31:43 +0000 Message-ID: <1392125503-15803-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.8.5.2 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST] Allow forcing the use of current osstest HEAD for branch=osstest 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.212.44 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: Otherwise cr-daily-branch expects $HOME/testing.git to exist and will git-reset it etc, which is rather annoying when in standalone mode... Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- ap-fetch-version | 8 ++++++-- ap-fetch-version-old | 8 ++++++-- cr-daily-branch | 4 +++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ap-fetch-version b/ap-fetch-version index 1f3c6e9..5a5d5c4 100755 --- a/ap-fetch-version +++ b/ap-fetch-version @@ -70,8 +70,12 @@ linuxfirmware) $UPSTREAM_TREE_LINUXFIRMWARE master daily-cron.$branch ;; osstest) - git-fetch $HOME/testing.git pretest:ap-fetch >&2 - git-rev-parse ap-fetch^0 + if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then + git-fetch $HOME/testing.git pretest:ap-fetch >&2 + git-rev-parse ap-fetch^0 + else + git-rev-parse HEAD^0 + fi ;; *) echo >&2 "branch $branch ?" diff --git a/ap-fetch-version-old b/ap-fetch-version-old index 353a817..0f5af49 100755 --- a/ap-fetch-version-old +++ b/ap-fetch-version-old @@ -74,8 +74,12 @@ linuxfirmware) $TREE_LINUXFIRMWARE master daily-cron-old.$branch ;; osstest) - git-fetch -f $HOME/testing.git incoming:ap-fetch - git-rev-parse ap-fetch^0 + if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then + git-fetch -f $HOME/testing.git incoming:ap-fetch + git-rev-parse ap-fetch^0 + else + git-rev-parse HEAD^0 + fi ;; *) echo >&2 "branch $branch ?" diff --git a/cr-daily-branch b/cr-daily-branch index c4a0872..41ca796 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -146,7 +146,9 @@ osstest) determine_version REVISION_OSSTEST osstest realtree= NEW_REVISION=$REVISION_OSSTEST - git reset --hard $REVISION_OSSTEST + if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then + git reset --hard $REVISION_OSSTEST + fi ;; qemuu) realtree=qemu-upstream-${xenbranch#xen-}