From patchwork Thu May 15 10:30:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 30250 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8930D202E6 for ; Thu, 15 May 2014 10:38:28 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id w7sf3099289qcr.0 for ; Thu, 15 May 2014 03:38:28 -0700 (PDT) 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=pni1SR9/vbtp2aRRYzZQA/69KcFbmv3KE+DQdXn9wXM=; b=c5/nIgRzX/VOINnB/IO0NLy/HB7EYGoLUF8ggf5lj21y5+lCyxANfhu9I3mV0QeJnh z6GMjeTMR5DzZ/NvtgNmXwr1SkLzqp0P74TsWjz7E5WniVvEucdpEZCAfJmutzTy4RtT +zLh1ide6i0E4gIak3wKAWjrkpDlCuVuLlGZvKguvelDuNqZMQOwjxyd1/o3Ge7H3psB NARakof0KZBCOYQhEn7pTgVS+m9YqcUo3qBdfroY4SMULfym9VMtQX+/eLPK+tH/mSIH +wC5ZdbZ54IyhJ8RMsBgavfu0dfO/+F87sHfSV9a1mvGVgAyVhXPgEYraUADUJPneBkp H0/A== X-Gm-Message-State: ALoCoQnYXXCPxd7B+oTB0JLWjuulj7129I+hsZ+UUJq1xwb3nyKQ1hDV5fsFrpa6+z5CDVNFvb7y X-Received: by 10.58.107.203 with SMTP id he11mr4668977veb.12.1400150308389; Thu, 15 May 2014 03:38:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.203 with SMTP id m69ls187510qga.84.gmail; Thu, 15 May 2014 03:38:28 -0700 (PDT) X-Received: by 10.52.13.98 with SMTP id g2mr40174vdc.46.1400150308273; Thu, 15 May 2014 03:38:28 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id is3si864783vec.45.2014.05.15.03.38.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 May 2014 03:38:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id lh14so4099519vcb.33 for ; Thu, 15 May 2014 03:38:28 -0700 (PDT) X-Received: by 10.52.116.101 with SMTP id jv5mr6727958vdb.11.1400150308188; Thu, 15 May 2014 03:38:28 -0700 (PDT) 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.221.72 with SMTP id ib8csp311357vcb; Thu, 15 May 2014 03:38:27 -0700 (PDT) X-Received: by 10.224.74.131 with SMTP id u3mr11379239qaj.46.1400150306595; Thu, 15 May 2014 03:38:26 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id g4si2325024qai.51.2014.05.15.03.38.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 May 2014 03:38:26 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) 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 1Wkt2f-000392-GP; Thu, 15 May 2014 10:37:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wkt2e-00038e-In for xen-devel@lists.xen.org; Thu, 15 May 2014 10:37:36 +0000 Received: from [85.158.143.35:46830] by server-2.bemta-4.messagelabs.com id 49/83-06539-FE894735; Thu, 15 May 2014 10:37:35 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1400149848!5105856!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2804 invoked from network); 15 May 2014 10:30:49 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 15 May 2014 10:30:49 -0000 X-IronPort-AV: E=Sophos; i="4.97,1058,1389744000"; d="scan'208"; a="130635086" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 15 May 2014 10:30:44 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Thu, 15 May 2014 06:30:43 -0400 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Wksvy-0005kW-J1; Thu, 15 May 2014 11:30:43 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Thu, 15 May 2014 11:30:42 +0100 From: Ian Campbell To: , Date: Thu, 15 May 2014 11:30:37 +0100 Message-ID: <1400149839-8489-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1400149787.4386.29.camel@kazak.uk.xensource.com> References: <1400149787.4386.29.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST v3 4/6] ts-xen-build: Move Xen build tree from xen-unstable to just xen 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) 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: It's not always xen-unstable we are testing, and I had to check that it was the right generic name, so reduce this confusion. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- ts-xen-build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ts-xen-build b/ts-xen-build index 1d5d2bf..78ba806 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -37,7 +37,7 @@ my $makeflags= get_host_property($ho, 'build make flags', '-j4'); sub checkout () { target_cmd($ho, "rm -rf $builddir && mkdir $builddir", 60); - build_clone($ho, 'xen', $builddir, 'xen-unstable'); + build_clone($ho, 'xen', $builddir, 'xen'); my $debug_build = $r{xen_build_debug} || 'y'; @@ -50,7 +50,7 @@ sub checkout () { my $earlyprintk = get_host_property($ho, 'EarlyPrintk', undef); target_cmd_build($ho, 100, $builddir, <.config echo >>.config debug=$debug_build echo >>.config GIT_HTTP=y @@ -85,7 +85,7 @@ END sub buildcmd_stamped_logged ($$$$$) { my ($timeout, $stampname, $prefix, $cmd, $suffix) = @_; target_cmd_build($ho, $timeout, $builddir, <&1 && touch ../$stampname-ok-stamp ) |tee ../$stampname-log @@ -120,7 +120,7 @@ END } sub collectversions () { - my $tools="$builddir/xen-unstable/tools"; + my $tools="$builddir/xen/tools"; store_revision($ho, 'qemu', "$tools/ioemu-dir", 1); store_revision($ho, 'qemu', "$tools/qemu-xen-traditional-dir", 1); store_revision($ho, 'qemuu', "$tools/qemu-xen-dir", 1); @@ -130,7 +130,7 @@ sub collectversions () { sub divide () { target_cmd_build($ho, 100, $builddir, <