From: kn <kn@openbsd.org>
Date: Wed, 24 Aug 2022 20:38:03 +0000 (+0000)
Subject: run -p on all chunk devices for now to make progress
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c8e751be1d2c0538fd433303d4073b0578f73bff;p=openbsd

run -p on all chunk devices for now to make progress

These tests run on amd64, arm64 and sparc64, of which only arm64 implements
filesystem preparation;  always run to test NOOPs on the other two as well
and be reminded about via XXX in the output.

Best to fix explicit stage files on arm64 (all EFI platforms) first,
polish these tests for arm64 a bit further and then revert these prepare
per chunk bits again -- easier than keeping a local diff while committing.
---

diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index 0e13d6e9a8b..34d143ea053 100644
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2022/08/24 20:31:06 kn Exp $
+#	$OpenBSD: Makefile,v 1.6 2022/08/24 20:38:03 kn Exp $
 
 INSTALLBOOT ?=		/usr/sbin/installboot
 DRY_RUN =		${INSTALLBOOT} -n
@@ -64,9 +64,12 @@ REGRESS_TARGETS = prepare
 
 # what the installer does, see /usr/src/distrib/$(machine)/ramdisk/install.md
 # do this as regress target and not in format-new-chunks
-# XXX -p is not yet softraid(4) aware
 prepare:
 	${SUDO} ${REAL_RUN} -p -- "$$(<${SRFILE})"
+	# XXX -p is not yet softraid(4) aware, need to prepare chunks manually
+.  for devfile in ${DEVFILES}
+	${SUDO} ${REAL_RUN} -p -- "$$(<${devfile})"
+.  endfor
 .else
 REGRESS_TARGETS =	# empty
 .endif