[RFC,OSSTEST,v1,03/12] mfi-common: Rename $suite_runvars as $hostos_runvars

Commit Message

Ian Campbell Jan. 8, 2016, 2:29 p.m. UTC

Later in the series more runvars to control the host install will be
added.

Signed-off-by: Ian Campbell <[e-mail]>
---
 mfi-common | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

Comments

Ian Jackson Jan. 8, 2016, 3:10 p.m. UTC | #1

Ian Campbell writes ("[PATCH RFC OSSTEST v1 03/12] mfi-common: Rename $suite_runvars as $hostos_runvars"):
> Later in the series more runvars to control the host install will be
> added.

Acked-by: Ian Jackson <[e-mail]>

Patch

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