@@ -736,6 +736,15 @@ test_matrix_do_one () {
do_credit12_tests
do_examine_one
+ case "$dom0arch" in
+ i386|amd64)
+ # Test on BIOS, which makes sure we test one where FreeBSD should
+ # work. See ts-memdisk-try-append, and set_freebsd_runvars in
+ # mfi-common.
+ do_examine_one bios
+ do_examine_one uefi
+ ;;
+ esac
# No further arm tests at the moment
if [ $dom0arch = armhf -o $dom0arch = arm64 ]; then
@@ -163,6 +163,7 @@ set_freebsd_runvars () {
if [ x$no_hostflags != xtrue ]; then
# osstest doesn't yet know how to install FreeBSD on UEFI hosts, so
# limit the usable hardware to boxes that boot from BIOS.
+ # See also in ts-memdisk-try-append.
freebsd_runvars="all_hostflags,=PropEq:Firmware:bios:bios"
fi
@@ -28,6 +28,20 @@ arch=`perl -I. -we '
$whhost ||= "host";
our $ho = selecthost($whhost);
+ if (get_target_property($ho,"firmware") ne "bios") {
+ # osstest does not yet know how to install FreeBSD on UEFI hosts
+ # See also in set_freebsd_runvars in mfi_common
+
+ # Skipping this test on non-BIOS does not lead to pushes
+ # where this test is broken, because make-flght test_matrix_do_one
+ # arranges to run this test on BIOS too.
+
+ broken("skipping memdisk because firmware is not bios",
+ "skip");
+ print "SKIP\n" or die $!;
+ exit 0;
+ }
+
print $ho->{Arch} or die $!;
' "$@"`
@@ -38,6 +52,10 @@ amd64)
echo "Arch $arch not supported for memdisk tests"
exit 0
;;
+SKIP)
+ echo "Step skipped."
+ exit 0
+ ;;
*)
echo >&2 'Job arch retrieval failed?'
exit 1
This is a combination of two changes: ts-memdisk-try-append: skip memdisk test on non-BIOS hosts make-flight: examine: Insist on -bios and -uefi tests on x86 This will let us skip ts-memdisk-try-append on non-bios platforms without risking regression. It will also definitely spot regressions which will occur on any uefi host. standalone-generate-dump-flight-runvars reveals the changes are as follows: New jobs test-amd64-i386-examine-bios test-amd64-i386-examine-uefi test-amd64-amd64-examine-bios test-amd64-amd64-examine-uefi added everywhere that has the corresponding plain job, namely osstest linux-* xen-unstable These jobs are just like the plain jobs, except that one of ,PropEq:Firmware:bios:bios ,PropEq:Firmware:bios:uefi has been added to the end of all_hostflags. Signed-off-by: Ian Jackson <iwj@xenproject.org> Release-Acked-by: Ian Jackson <iwj@xenproject.org> --- make-flight | 9 +++++++++ mfi-common | 1 + ts-memdisk-try-append | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+)