Hook up installboot unconditionally, skip on unsupported archs

The list of not yet tested archs is smaller, so follow bsd.regress.mk(5)
advise and just print SKIPPED on those.

diff --git a/regress/usr.sbin/Makefile b/regress/usr.sbin/Makefile
index 195fde3..0665c75 100644 (file)
--- a/regress/usr.sbin/Makefile
+++ b/regress/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.32 2022/09/12 13:10:03 kn Exp $
+#      $OpenBSD: Makefile,v 1.33 2022/09/17 09:30:18 kn Exp $
 
 SUBDIR += acme-client
 SUBDIR += arp
@@ -6,6 +6,7 @@ SUBDIR += bgpd
 SUBDIR += btrace
 SUBDIR += httpd
 SUBDIR += ifstated
+SUBDIR += installboot
 SUBDIR += ldapd
 SUBDIR += mtree
 SUBDIR += ocspcheck
@@ -20,18 +21,6 @@ SUBDIR += syslogd
 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
-
 .if defined(REGRESS_FULL) || make(clean) || make(cleandir) || make(obj)
 SUBDIR += pkg_add
 .endif

diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index 43da01a..8d91ccb 100644 (file)
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.32 2022/09/14 13:37:03 kn Exp $
+#      $OpenBSD: Makefile,v 1.33 2022/09/17 09:30:18 kn Exp $
 
 INSTALLBOOT ?=         /usr/sbin/installboot
 DRY_RUN =              ${INSTALLBOOT} -n
@@ -31,8 +31,11 @@ STAGENAMES =         BOOTRISCV64.EFI
 FORMAT_DISK =          true    # NOOP
 STAGENAMES =           bootblk ofwboot
 USE_SOFTRAID ?=                Yes
-.endif
+.else
 # missing: alpha, hppa, landisk, loongson, luna88k
+regress:
+       @echo SKIPPED
+.endif
 
 FORMAT_DISK ?=         fdisk -iy -b '32768@32768:C'
 STAGEDIR =             /usr/mdec