7 files changed, 46 insertions, 69 deletions
diff --git a/regress/sys/dev/kcov/Makefile b/regress/sys/dev/kcov/Makefile
index e542a7fad5a..f122daedda0 100644
--- a/regress/sys/dev/kcov/Makefile
+++ b/regress/sys/dev/kcov/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2020/10/03 07:35:07 anton Exp $
+#	$OpenBSD: Makefile,v 1.13 2020/12/16 22:59:54 bluhm Exp $
 
 PROG=		kcov
 WARNINGS=	yes
@@ -23,20 +23,18 @@ TESTS+=	remote-close
 TESTS+=	remote-interrupt
 TESTS+=	state
 
-REGRESS_SETUP_ONCE=	setup
-setup: ${PROG}
+REGRESS_SETUP=		${PROG}
 
 .for m in ${MODES}
 .  for b in ${BUFSIZES}
 .    for t in ${TESTS}
-$m-$b-$t:
-	@echo "\n======== ${@} ========"
+run-$m-$b-$t:
 	if ${SUDO} ./${PROG} -p; then \
 		${SUDO} ./${PROG} ${KCOVFLAGS} -b $b -m $m $t; \
 	else \
 		echo "SKIPPED"; \
 	fi
-REGRESS_TARGETS+=	$m-$b-$t
+REGRESS_TARGETS+=	run-$m-$b-$t
 .    endfor
 .  endfor
 .endfor
diff --git a/regress/sys/dev/wscons/Makefile b/regress/sys/dev/wscons/Makefile
index 4460391b45a..8226a56ac2f 100644
--- a/regress/sys/dev/wscons/Makefile
+++ b/regress/sys/dev/wscons/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2019/03/21 11:58:33 bluhm Exp $
+# $OpenBSD: Makefile,v 1.10 2020/12/16 22:59:55 bluhm Exp $
 
 WARNINGS=	yes
 
@@ -30,9 +30,8 @@ IGNORE_sigio+=	wsmouse0-sigio
 .for d in ${DEVICES}
 .  for t in ${TESTS_sigio}
 .    if empty(IGNORE_sigio:M$d-$t)
-REGRESS_TARGETS+=	${PROG_sigio}-$d-$t
-${PROG_sigio}-$d-$t: ${PROG_sigio}
-	@echo "\n======== ${@} ========"
+REGRESS_TARGETS+=	run-${PROG_sigio}-$d-$t
+run-${PROG_sigio}-$d-$t: ${PROG_sigio}
 .      if ${HAVE_${d}:L} == "yes"
 	./${PROG_sigio} -d /dev/$d $t
 .      else
@@ -51,9 +50,8 @@ TESTS_wscons+=	ioctl-unknown
 
 .for d in ${DEVICES}
 .  for t in ${TESTS_wscons}
-REGRESS_TARGETS+=	${PROG_wscons}-$d-$t
-${PROG_wscons}-$d-$t: ${PROG_wscons}
-	@echo "\n======== ${@} ========"
+REGRESS_TARGETS+=	run-${PROG_wscons}-$d-$t
+run-${PROG_wscons}-$d-$t: ${PROG_wscons}
 .    if ${HAVE_${d}:L} == "yes"
 	./${PROG_wscons} -d /dev/$d $t
 .    else
diff --git a/regress/sys/kern/flock/Makefile b/regress/sys/kern/flock/Makefile
index 143f0044365..d0952ee8ed5 100644
--- a/regress/sys/kern/flock/Makefile
+++ b/regress/sys/kern/flock/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2020/03/11 17:27:55 anton Exp $
+#	$OpenBSD: Makefile,v 1.11 2020/12/16 22:59:55 bluhm Exp $
 
 PROGS+=		flock
 SRCS_flock=	flock.c util.c
@@ -10,18 +10,16 @@ WARNINGS=	yes
 
 TESTS_FLOCK!=	jot 24 1
 .for t in ${TESTS_FLOCK}
-flock-$t: flock
-	@echo '\n======== $@ ========'
+run-flock-$t: flock
 	./flock ${LOCKFLAGS} $t
-REGRESS_TARGETS+=flock-$t
+REGRESS_TARGETS+=run-flock-$t
 .endfor
 
 TESTS_LOCKF!=	jot 2 1
 .for t in ${TESTS_LOCKF}
-lockf-$t: lockf
-	@echo '\n======== $@ ========'
+run-lockf-$t: lockf
 	./lockf ${LOCKFLAGS} $t
-REGRESS_TARGETS+=lockf-$t
+REGRESS_TARGETS+=run-lockf-$t
 .endfor
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/kern/pipe/Makefile b/regress/sys/kern/pipe/Makefile
index 812b67cc755..b2ee4cfc406 100644
--- a/regress/sys/kern/pipe/Makefile
+++ b/regress/sys/kern/pipe/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2020/06/29 18:25:37 anton Exp $
+#	$OpenBSD: Makefile,v 1.4 2020/12/16 22:59:55 bluhm Exp $
 
 PROG=		pipe
 
@@ -27,14 +27,12 @@ TESTS+=	thundering-herd-read-wakeup
 TESTS+=	thundering-herd-write-signal
 TESTS+=	thundering-herd-write-wakeup
 
-REGRESS_SETUP_ONCE=	setup
-setup: ${PROG}
+REGRESS_SETUP=		${PROG}
 
 .for t in ${TESTS}
-${t}:
-	@echo "\n======== ${@} ========"
-	./${PROG} ${t}
-REGRESS_TARGETS+=	${t}
+run-$t:
+	./${PROG} $t
+REGRESS_TARGETS+=	run-$t
 .endfor
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/netinet6/srcaddr/Makefile b/regress/sys/netinet6/srcaddr/Makefile
index da60091f529..7669fea30af 100644
--- a/regress/sys/netinet6/srcaddr/Makefile
+++ b/regress/sys/netinet6/srcaddr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2020/04/13 03:09:29 pamela Exp $
+# $OpenBSD: Makefile,v 1.2 2020/12/16 22:59:55 bluhm Exp $
 
 RTABLE		?=	1
 VETHER		?=	vether1
@@ -20,7 +20,6 @@ regress:
 
 REGRESS_SETUP +=	setup
 setup: cleanup
-	@echo '\n======== $@ ========'
 	${SUDO} ifconfig ${VETHER} inet6 rdomain ${RTABLE} eui64 up
 	sh -c "ifconfig ${VETHER} | awk '/inet6/ {print \$$2}' > ${VETHER_LL}"
 	${SUDO} ifconfig lo${RTABLE} inet rdomain ${RTABLE} 127.0.0.1/8 up
@@ -28,24 +27,20 @@ setup: cleanup
 
 REGRESS_CLEANUP +=	cleanup
 cleanup:
-	@echo '\n======== $@ ========'
 .for iface in ${VETHER} lo${RTABLE}
 	${SUDO} ifconfig ${iface} destroy 2>/dev/null || true
 .endfor
 
-REGRESS_TARGETS +=	localhost
-localhost: srcaddr
-	@echo '\n======== $@ ========'
-	${REXEC} ${.OBJDIR}/srcaddr ::1 | \
+REGRESS_SETUP +=	${PROG}
+
+REGRESS_TARGETS +=	run-localhost
+run-localhost:
+	${REXEC} ./srcaddr ::1 | \
 	    diff -up ${.CURDIR}/localhost.ok /dev/stdin
 
-REGRESS_TARGETS +=	linklocal
-linklocal: srcaddr
-	@echo '\n======== $@ ========'
-	${REXEC} ${.OBJDIR}/srcaddr fe80::1%${VETHER} | \
+REGRESS_TARGETS +=	run-linklocal
+run-linklocal:
+	${REXEC} ./srcaddr fe80::1%${VETHER} | \
 	    diff -up ${VETHER_LL} /dev/stdin
 
-.PHONY:	${REGRESS_TARGETS}
-
 .include <bsd.regress.mk>
-
diff --git a/regress/sys/uvm/vnode/Makefile b/regress/sys/uvm/vnode/Makefile
index df56cc3510c..46d6069acc5 100644
--- a/regress/sys/uvm/vnode/Makefile
+++ b/regress/sys/uvm/vnode/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2020/12/03 19:16:57 anton Exp $
+#	$OpenBSD: Makefile,v 1.4 2020/12/16 22:59:55 bluhm Exp $
 
 PROG=		vnode
 
@@ -9,14 +9,12 @@ WARNINGS=	yes
 
 TESTS+=	deadlock
 
-REGRESS_SETUP_ONCE=	setup
-setup: ${PROG}
+REGRESS_SETUP=	${PROG}
 
 .for t in ${TESTS}
-${t}:
-	@echo "\n======== ${@} ========"
-	f=`mktemp`; trap 'rm $$f' EXIT; ./${PROG} -f $$f ${t}
-REGRESS_TARGETS+=	${t}
+run-$t:
+	f=`mktemp`; trap 'rm $$f' EXIT; ./${PROG} -f $$f $t
+REGRESS_TARGETS+=	run-$t
 .endfor
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.sbin/vmd/config/Makefile b/regress/usr.sbin/vmd/config/Makefile
index fdbe4072260..1a769794958 100644
--- a/regress/usr.sbin/vmd/config/Makefile
+++ b/regress/usr.sbin/vmd/config/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2019/07/16 21:07:08 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.10 2020/12/16 22:59:55 bluhm Exp $
 
 VMD ?= /usr/sbin/vmd
 
@@ -9,29 +9,23 @@ VMD_FAIL=kernel-keyword too-few-ram vm-name-too-long too-many-ifs \
 	 switch-no-interface switch-no-add cdrom-name-too-long \
 	 bad-format missing-format
 
-REGRESS_TARGETS=
-
 .for n in ${VMD_PASS}
-REGRESS_TARGETS +=	vmd-pass-${n}
-
-vmd-pass-${n}:
-	@echo '======== $@ ========'
-	${VMD} -n -f ${.CURDIR}/vmd-pass-${n}.conf 2>&1 | \
-	    diff -u ${.CURDIR}/vmd-pass-${n}.ok /dev/stdin
+REGRESS_TARGETS +=	run-pass-$n
+run-pass-$n:
+	${VMD} -n -f ${.CURDIR}/vmd-pass-$n.conf 2>&1 | \
+	    diff -u ${.CURDIR}/vmd-pass-$n.ok /dev/stdin
 .endfor
 
 .for n in ${VMD_FAIL}
-REGRESS_TARGETS +=	vmd-fail-${n}
-
-vmd-fail-${n}:
-	@echo '======== $@ ========'
-	${VMD} -n -f ${.CURDIR}/vmd-fail-${n}.conf 2>&1 | \
+REGRESS_TARGETS +=	run-fail-$n
+run-fail-$n:
+	${VMD} -n -f ${.CURDIR}/vmd-fail-$n.conf 2>&1 | \
 	    cut -d : -f 2,3,4 | \
-	    diff -u ${.CURDIR}/vmd-fail-${n}.ok /dev/stdin
+	    diff -u ${.CURDIR}/vmd-fail-$n.ok /dev/stdin
 .endfor
 
-vmd-fail-too-many-disks: disk0.img disk1.img disk2.img disk3.img disk4.img
-vmd-fail-bad-format vmd-fail-missing-format vmd-pass-format-keyword: foo.img
+run-fail-too-many-disks: disk0.img disk1.img disk2.img disk3.img disk4.img
+run-fail-bad-format run-fail-missing-format run-pass-format-keyword: foo.img
 
 foo.img disk0.img disk1.img disk2.img disk3.img disk4.img:
 	touch $@
@@ -40,8 +34,8 @@ PATH_LONG =	some/relativepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abc
 BOOT_PATH_LONG =	${PATH_LONG}/bsd.rd
 DISK_PATH_LONG =	${PATH_LONG}/bsd.img
 
-vmd-fail-boot-name-too-long: ${BOOT_PATH_LONG}
-vmd-fail-disk-path-too-long: ${DISK_PATH_LONG}
+run-fail-boot-name-too-long: ${BOOT_PATH_LONG}
+run-fail-disk-path-too-long: ${DISK_PATH_LONG}
 
 ${BOOT_PATH_LONG} ${DISK_PATH_LONG}:
 	mkdir -p ${@:H}
@@ -51,6 +45,4 @@ clean:
 	rm -f -- *.img
 	rm -rf some
 
-.PHONY: ${REGRESS_TARGETS}
-
 .include <bsd.regress.mk>