xsm_variants: Allow XSM enablement to depend on the architecture

Builds and tests have different ideas about arch variables, because
tests have dom0 arch, xen arch, etc.  So pass it in as a parameter.

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/make-flight b/make-flight
index 4e2d464f517b9ef3223ff4efd5efef40816b571f..0e63bc074b749091e663685c591dd7c5bc95331e 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -429,7 +429,7 @@ do_hvm_debian_test_one () {
 }
 
 do_hvm_debian_tests() {
-  xsms=$(xenbranch_xsm_variants)
+  xsms=$(xsm_variants $xenarch)
 
   if [ $xenarch != amd64 ]; then
     return
@@ -636,7 +636,7 @@ do_pv_debian_test_one () {
 }
 
 do_pv_debian_tests () {
-  xsms=$(xenbranch_xsm_variants)
+  xsms=$(xsm_variants $xenarch)
 
   for xsm in $xsms ; do
     # Basic PV Linux test with xl

diff --git a/mfi-common b/mfi-common
index baf5380d9d2b97cc3803756883bb9abd76f97411..a73b138d1cb618c30f23c1aecb6000176cd08200 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -54,7 +54,8 @@ branch_wants_migrupgrade_tests () {
   esac
 }
 
-xenbranch_xsm_variants () {
+xsm_variants () {
+    local arch="$1"
     case "$xenbranch" in
     xen-3.*-testing) echo "false";;
     xen-4.0-testing) echo "false";;
@@ -286,7 +287,7 @@ create_build_jobs () {
 
     build_hostflags=share-build-$suite-$arch,arch-$arch,suite-$suite,purpose-build
 
-    for enable_xsm in $(xenbranch_xsm_variants) ; do
+    for enable_xsm in $(xsm_variants $arch) ; do
       if [ x$enable_xsm = xtrue ] ; then
         xsm_suffix="-xsm"
       else