From patchwork Wed Feb 3 09:46:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8199591 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DAC339F37A for ; Wed, 3 Feb 2016 09:48:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17AA120221 for ; Wed, 3 Feb 2016 09:48:53 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6CE8D20218 for ; Wed, 3 Feb 2016 09:48:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQu10-000295-OQ; Wed, 03 Feb 2016 09:46:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQu0z-00028v-M7 for xen-devel@lists.xen.org; Wed, 03 Feb 2016 09:46:21 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 05/6C-21901-C6CC1B65; Wed, 03 Feb 2016 09:46:20 +0000 X-Env-Sender: prvs=8347a21d9=Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1454492778!19690958!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55930 invoked from network); 3 Feb 2016 09:46:20 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 3 Feb 2016 09:46:20 -0000 X-IronPort-AV: E=Sophos;i="5.22,389,1449532800"; d="scan'208";a="335762753" From: Ian Campbell To: , Date: Wed, 3 Feb 2016 09:46:14 +0000 Message-ID: <1454492776-23788-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.6.1 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 1/3] Move collectversions from ts-xen-build into Osstest::BuildSupport X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I'm going to have a need for it elsewhere. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/BuildSupport.pm | 12 ++++++++++++ ts-xen-build | 13 +------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Osstest/BuildSupport.pm b/Osstest/BuildSupport.pm index 933f6e1..a183546 100644 --- a/Osstest/BuildSupport.pm +++ b/Osstest/BuildSupport.pm @@ -42,6 +42,7 @@ BEGIN { xendist $xendist + collect_xen_built_versions submodulefixup submodule_have submodule_find @@ -84,6 +85,17 @@ sub xendist () { ($ho, 'xendist', '', $r{"buildjob"}); } +sub collect_xen_built_versions () { + my $tools="$builddir/xen/tools"; + my $extras="$builddir/xen/extras"; + 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); + store_revision($ho, 'seabios', "$tools/firmware/seabios-dir", 1); + store_revision($ho, 'ovmf', "$tools/firmware/ovmf-dir", 1); + store_revision($ho, 'minios', "$extras/mini-os", 1); +} + #----- submodules ----- sub submodulefixup ($$$$) { diff --git a/ts-xen-build b/ts-xen-build index 8f92729..382fe62 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -151,17 +151,6 @@ END } } -sub collectversions () { - my $tools="$builddir/xen/tools"; - my $extras="$builddir/xen/extras"; - 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); - store_revision($ho, 'seabios', "$tools/firmware/seabios-dir", 1); - store_revision($ho, 'ovmf', "$tools/firmware/ovmf-dir", 1); - store_revision($ho, 'minios', "$extras/mini-os", 1); -} - sub divide () { # Only move hv to xeninstall, so that we can have # xenpolicy in tools tarball. @@ -248,7 +237,7 @@ sub trapping ($) { checkout(); trapping(\&build); -trapping(\&collectversions); +trapping(\&collect_xen_built_versions); die "*** something failed:\n\n".(join "\n\n",@probs)."\n** something failed" if @probs;