From patchwork Fri Jan 8 14:29:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 7986901 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 B06749F38D for ; Fri, 8 Jan 2016 14:33:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C189420149 for ; Fri, 8 Jan 2016 14:33:10 +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 CA83720142 for ; Fri, 8 Jan 2016 14:33:09 +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 1aHY3N-0004mM-24; Fri, 08 Jan 2016 14:30:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHY3L-0004lx-Ck for xen-devel@lists.xen.org; Fri, 08 Jan 2016 14:30:07 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id DF/98-09708-EE7CF865; Fri, 08 Jan 2016 14:30:06 +0000 X-Env-Sender: prvs=80839a509=Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1452263391!9194023!3 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 19118 invoked from network); 8 Jan 2016 14:30:05 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jan 2016 14:30:05 -0000 X-IronPort-AV: E=Sophos;i="5.20,538,1444694400"; d="scan'208";a="329856663" From: Ian Campbell To: , Date: Fri, 8 Jan 2016 14:29:50 +0000 Message-ID: <1452263399-14094-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1452263368.29416.39.camel@citrix.com> References: <1452263368.29416.39.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH RFC OSSTEST v1 03/12] mfi-common: Rename $suite_runvars as $hostos_runvars 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 Later in the series more runvars to control the host install will be added. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- mfi-common | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/mfi-common b/mfi-common index b739c7d..ccf8a5b 100644 --- a/mfi-common +++ b/mfi-common @@ -80,7 +80,7 @@ create_build_jobs () { local arch local pvops_kernel pvops_kconfig_overrides - local suite suite_runvars + local suite hostos_runvars local want_xend build_defxend build_extraxend local enable_ovmf local build_hostflags @@ -124,9 +124,9 @@ create_build_jobs () { esac if [ $suite != $defsuite ] ; then - suite_runvars="host_suite=$suite" + hostos_runvars="host_suite=$suite" else - suite_runvars= + hostos_runvars= fi # In 4.4 onwards xend is off by default. If necessary we build a @@ -192,7 +192,7 @@ create_build_jobs () { tree_seabios=$TREE_SEABIOS \ tree_ovmf=$TREE_OVMF \ $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ - $suite_runvars \ + $hostos_runvars \ host_hostflags=$build_hostflags \ revision_xen=$REVISION_XEN \ revision_qemu=$REVISION_QEMU \ @@ -214,7 +214,7 @@ create_build_jobs () { enable_xsm=false \ tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ - $suite_runvars \ + $hostos_runvars \ host_hostflags=$build_hostflags \ revision_xen=$REVISION_PREVXEN fi @@ -226,7 +226,7 @@ create_build_jobs () { tree_qemuu=$TREE_QEMU_UPSTREAM \ tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ - $suite_runvars \ + $hostos_runvars \ host_hostflags=$build_hostflags \ revision_xen=$REVISION_XEN \ revision_qemu=$REVISION_QEMU \ @@ -236,7 +236,7 @@ create_build_jobs () { job_create_build build-$arch-pvops build-kern \ arch=$arch kconfighow=xen-enable-xen-config \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars \ - $suite_runvars \ + $hostos_runvars \ host_hostflags=$build_hostflags \ $pvops_kernel $pvops_kconfig_overrides \ ${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX} \ @@ -249,7 +249,7 @@ create_build_jobs () { arch=$arch \ tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_LIBVIRT_RUNVARS $arch_runvars \ - $suite_runvars \ + $hostos_runvars \ host_hostflags=$build_hostflags \ buildjob=${bfi}build-$arch \ tree_libvirt=$TREE_LIBVIRT revision_libvirt=$REVISION_LIBVIRT\ @@ -264,7 +264,7 @@ create_build_jobs () { arch=$arch \ tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_RUMPUSERXEN_RUNVARS $arch_runvars \ - $suite_runvars \ + $hostos_runvars \ host_hostflags=$build_hostflags \ buildjob=${bfi}build-$arch \ tree_rumpuserxen=$TREE_RUMPUSERXEN \ @@ -293,7 +293,7 @@ create_build_jobs () { arch=$arch kconfighow=create-config-sh \ kimagefile=vmlinux \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_OLD_RUNVARS \ - $arch_runvars $suite_runvars \ + $arch_runvars $hostos_runvars \ host_hostflags=$build_hostflags \ tree_linux=http://xenbits.xen.org/linux-2.6.18-xen.hg \ revision_linux=$REVISION_LINUX_OLD @@ -355,6 +355,7 @@ usual_debianhvm_image () { # Provides various convenience variables for the callback. # test_matrix_iterate () { + local hostos_runvars case "$xenbranch" in xen-3.*-testing) pairtoolstack=xend ;; @@ -409,9 +410,9 @@ test_matrix_iterate () { esac if [ $suite != $defsuite ] ; then - suite_runvars="host_suite=$suite" + hostos_runvars="host_suite=$suite" else - suite_runvars= + hostos_runvars= fi for kern in ''; do @@ -452,7 +453,7 @@ test_matrix_iterate () { arch=$dom0arch \ kernbuildjob=${bfi}build-$dom0arch-$kernbuild \ kernkind=$kernkind \ - $arch_runvars $suite_runvars + $arch_runvars $hostos_runvars " test_matrix_do_one