summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorKlemens Nanni <kn@cvs.openbsd.org>2022-09-12 13:10:05 +0000
committerKlemens Nanni <kn@cvs.openbsd.org>2022-09-12 13:10:05 +0000
commitab8388c00912a66d7976a515f074a92bb0b60ab8 (patch)
tree0e472a307ba28e9726a6af7d5db062affc8e5c01 /regress
parentd2525dc87142b21f94bcb0a52a445ba948436f36 (diff)
Hook up installboot(8) tests on all covered archs
Those that still fail (softraid+keydisk or explicit-stage-files) have fixes on tech@.
Diffstat (limited to 'regress')
-rw-r--r--regress/usr.sbin/Makefile7
-rw-r--r--regress/usr.sbin/installboot/Makefile3
2 files changed, 8 insertions, 2 deletions
diff --git a/regress/usr.sbin/Makefile b/regress/usr.sbin/Makefile
index a9d3bf88868..195fde3e2da 100644
--- a/regress/usr.sbin/Makefile
+++ b/regress/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2022/09/01 00:43:14 kn Exp $
+# $OpenBSD: Makefile,v 1.32 2022/09/12 13:10:03 kn Exp $
SUBDIR += acme-client
SUBDIR += arp
@@ -21,8 +21,13 @@ SUBDIR += vmd
.endif
.if ${MACHINE} == "amd64" || \
+ ${MACHINE} == "arm64" || \
+ ${MACHINE} == "armv7" || \
${MACHINE} == "i386" || \
${MACHINE} == "macppc" || \
+ ${MACHINE} == "octeon" || \
+ ${MACHINE} == "powerpc64" || \
+ ${MACHINE} == "riscv64" || \
${MACHINE} == "sparc64"
SUBDIR += installboot
.endif
diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index a64d190f010..83c477a7784 100644
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2022/09/09 12:55:43 kn Exp $
+# $OpenBSD: Makefile,v 1.27 2022/09/12 13:10:04 kn Exp $
INSTALLBOOT ?= /usr/sbin/installboot
DRY_RUN = ${INSTALLBOOT} -n
@@ -41,6 +41,7 @@ FORMAT_DISK = true # NOOP
STAGENAMES = bootblk ofwboot
USE_SOFTRAID ?= Yes
.endif
+# missing: alpha, hppa, landisk, loongson, luna88k
STAGEDIR = /usr/mdec
STAGEFILES = ${STAGENAMES:=${STAGEDIR}/%}