No functional change. (Verified for xen-unstable with
standalone-generate-dump-flight-runvars.)
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
Tested-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
v17: New patch.
---
make-flight | 2 +-
mfi-common | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/make-flight b/make-flight
index 28820f5..f908017 100755
--- a/make-flight
+++ b/make-flight
@@ -285,7 +285,7 @@ do_hvm_debian_test_one () {
test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \
enable_xsm=$xsm \
$stubdom_runvar $testvars \
- debianhvm_image=debian-7.2.0-$arch-CD-1.iso \
+ debianhvm_image=$(usual_debianhvm_image $arch) \
debianhvm_iso_kernel=/$iso_dir/vmlinuz \
debianhvm_iso_ramdisk=/$iso_dir/initrd.gz \
bios=$bios \
diff --git a/mfi-common b/mfi-common
index fab4aa3..5fbe195 100644
--- a/mfi-common
+++ b/mfi-common
@@ -351,6 +351,11 @@ job_create_test () {
xenbuildjob=$xenbuildjob buildjob=$buildjob $tsbuildjob "$@"
}
+usual_debianhvm_image () {
+ local arch=$1; shift
+ echo debian-${DEBIAN_IMAGE_VERSION-7.2.0}-$arch-CD-1.iso
+}
+
# Iterate over xenarch, dom0arch and kernel calling test_matrix_do_one
# for each combination.
#
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
