mfi-*: Reformat/refactor migrupgrade test generation slightly

* Introduce a variable "$hf" containing the hostflags.
* Properly indent the job_create_test call.

No functional change.  This will make the substantive change easier to
read.

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

diff --git a/make-flight b/make-flight
index 22dedf2a80f24f67c56a7b60a0780e155d411463..8d1a9b8801d7d6891c160563eac923551738919a 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -818,13 +818,15 @@ test_matrix_do_one () {
   if branch_wants_migrupgrade_tests ; then
       # x86 only for now
       if [ x$xenarch = xamd64 ] ; then
-      job_create_test test-$xenarch$kern-$dom0arch-migrupgrade test-pair-oneway \
+        local hf=$most_hostflags,equiv-1
+        job_create_test test-$xenarch$kern-$dom0arch-migrupgrade \
+                      test-pair-oneway \
                       xl $xenarch $dom0arch \
                       !host !host_hostflags \
                       src_host_buildjob=${bfi}build-$dom0arch-prev \
                       src_host_xenbuildjob=${bfi}build-$xenarch-prev \
                       $debian_runvars \
-                      all_hostflags=$most_hostflags,equiv-1
+                      all_hostflags="$hf"
       fi
       # TODO it would be nice to test i386->amd64 tools migration too (for
       # Xen >= 4.6), but currently $r{arch} is used in several places,