summaryrefslogtreecommitdiff
path: root/regress/usr.sbin
diff options
context:
space:
mode:
authorKlemens Nanni <kn@cvs.openbsd.org>2022-08-24 14:57:53 +0000
committerKlemens Nanni <kn@cvs.openbsd.org>2022-08-24 14:57:53 +0000
commit18d57ef70ca78c2510d22f9c7b71068883f931d5 (patch)
tree1d4222aab3153b11143ff8e298ba01b769ad6399 /regress/usr.sbin
parent48f089a7f9fb24b3ca17766677b6a7c9ee52409c (diff)
Add missing root-explicit-stages test, omit -v by default
Diffstat (limited to 'regress/usr.sbin')
-rw-r--r--regress/usr.sbin/installboot/Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index fba0646f926..f0277df772f 100644
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.1 2022/08/21 17:03:18 kn Exp $
+# $OpenBSD: Makefile,v 1.2 2022/08/24 14:57:52 kn Exp $
-INSTALLBOOT ?= /usr/sbin/installboot -v
+INSTALLBOOT ?= /usr/sbin/installboot
DRY_RUN = ${INSTALLBOOT} -n
REAL_RUN = ${INSTALLBOOT}
@@ -80,6 +80,15 @@ dry-root:
root-installer:
${SUDO} installboot -r /mnt "$$(<${SRFILE})"
+root-explicit-stages:
+.if ${MACHINE} == "amd64" # assume BIOS/MBR
+ ${SUDO} installboot -- "$$(<${SRFILE})" ${NEWROOT}/usr/mdec/biosboot ${NEWROOT}/usr/mdec/boot
+.elif ${MACHINE} == "arm64"
+ ${SUDO} installboot -- "$$(<${SRFILE})" ${NEWROOT}/usr/mdec/BOOTAA64.EFI
+.elif ${MACHINE} == "sparc64"
+ ${SUDO} installboot -- "$$(<${SRFILE})" ${NEWROOT}/usr/mdec/bootblk ${NEWROOT}/usr/mdec/ofwboot
+.endif
+
REGRESS_EXPECTED_FAILURES = dry-prepare-root \
dry-prepare-stage \