From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST 2/2] cr-daily-branch: make sure we test the correct tree for Linux branches Date: Tue, 11 Feb 2014 12:42:00 +0000 Message-ID: <1392122520-5453-2-git-send-email-ian.campbell@citrix.com> References: <1392122393.26657.102.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1392122393.26657.102.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org These branches should test the specific Linux tree which they and so should not apply the per-arch overrides which are only intended to be used to pick up an already verified tested Linux branch for use when testing some other non-linux branch. Signed-off-by: Ian Campbell --- Applied on top of a revert of a528b10cd6a552e92ed2b1b809c991a421ebdba6. --- cr-daily-branch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cr-daily-branch b/cr-daily-branch index 41ca796..02fef15 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -122,9 +122,16 @@ if [ "x$REVISION_LINUX" = x ]; then export REVISION_LINUX fi if [ "x$REVISION_LINUX_ARM" = x ]; then + if [ "x$tree" = "xlinux" ] ; then + TREE_LINUX_ARM=$TREE_LINUX + export TREE_LINUX_ARM + REVISION_LINUX_ARM=$REVISION_LINUX + export REVISION_LINUX_ARM + else determine_version REVISION_LINUX_ARM ${linuxbranch:-linux-arm-xen} \ LINUX_ARM export REVISION_LINUX_ARM + fi fi if [ "x$REVISION_LINUXFIRMWARE" = x ]; then determine_version REVISION_LINUXFIRMWARE linuxfirmware -- 1.8.5.2