From ab8388c00912a66d7976a515f074a92bb0b60ab8 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <kn@cvs.openbsd.org>
Date: Mon, 12 Sep 2022 13:10:05 +0000
Subject: Hook up installboot(8) tests on all covered archs

Those that still fail (softraid+keydisk or explicit-stage-files) have fixes on tech@.
---
 regress/usr.sbin/Makefile             | 7 ++++++-
 regress/usr.sbin/installboot/Makefile | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'regress')

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}/%}
-- 
cgit v1.2.3