From eaf5ec88c2df8efe49ce819c81aae582935c2e4c Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 25 Jan 2023 08:02:08 -0700 Subject: [PATCH] stand: Add testing for i386 as well to full-test.sh Sponsored by: Netflix --- tools/boot/full-test.sh | 45 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/tools/boot/full-test.sh b/tools/boot/full-test.sh index 6f45d6bfe20f..11f575779b92 100644 --- a/tools/boot/full-test.sh +++ b/tools/boot/full-test.sh @@ -279,7 +279,7 @@ make_linuxboot_images() zfs=${IMAGES}/${ma_combo}/linuxboot-${ma_combo}.zfs img=${IMAGES}/${ma_combo}/linuxboot-${ma_combo}.img img2=${IMAGES}/${ma_combo}/linuxboot-${ma_combo}-zfs.img - pool="linuxboot-testing" + pool="linuxboot" mkdir -p ${IMAGES}/${ma_combo} makefs -t msdos -o fat_type=32 -o sectors_per_cluster=1 \ -o volume_label=EFISYS -s100m ${esp} ${src} @@ -444,7 +444,6 @@ make_freebsd_images() ufs=${IMAGES}/${ma_combo}/freebsd-${ma_combo}.ufs img=${IMAGES}/${ma_combo}/freebsd-${ma_combo}.img mkdir -p ${IMAGES}/${ma_combo} -# XXX 4096 sector? makefs -t msdos -o fat_type=32 -o sectors_per_cluster=1 \ -o volume_label=EFISYS -s100m ${esp} ${src} makefs -t ffs -B little -s 200m -o label=root ${ufs} ${dir} ${dir2} @@ -454,6 +453,30 @@ make_freebsd_images() set -x + # BIOS i386 + a=i386:i386 + m=${a%%:*} + ma=${a##*:} + ma_combo="${m}" + [ "${m}" != "${ma}" ] && ma_combo="${m}-${ma}" + dir=${TREES}/${ma_combo}/freebsd + dir2=${TREES}/${ma_combo}/test-stand + ufs=${IMAGES}/${ma_combo}/freebsd-${ma_combo}.ufs + img=${IMAGES}/${ma_combo}/freebsd-${ma_combo}.img + mkdir -p ${IMAGES}/${ma_combo} + mkdir -p ${dir2}/etc + cat > ${dir2}/etc/fstab < ${out} <