make-flight: Set debianhvm_suite for Debian HVM tests

do_hvm_debian_test_one uses usual_debianhvm_image which honours the
prevailing value of $guestsuite.  However, it does not provide an
explicit suite setting in the runvars.

As a consequence, the test code will expect the image to install
whatever the default suite is.  If guestsuite is not the default
suite, there is a mismatch.  At the very least, the wrong
suite-specific workarounds will be applied.

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

diff --git a/make-flight b/make-flight
index 19b42d07a82a9354eb6b36b80f541b778b12435c..f324f6af914dc73a9ee257c08201e2e2a74f4152 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -341,6 +341,7 @@ do_hvm_debian_test_one () {
     test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \
     enable_xsm=$xsm                             \
     $stubdom_runvar $testvars                   \
+    debianhvm_suite=$guestsuite                        \
     debianhvm_image=$(usual_debianhvm_image $arch) \
     debianhvm_iso_kernel=/$iso_dir/vmlinuz \
     debianhvm_iso_ramdisk=/$iso_dir/initrd.gz \