6 files changed, 18 insertions, 18 deletions
diff --git a/regress/sys/kern/sosplice/Makefile.inc b/regress/sys/kern/sosplice/Makefile.inc
index 8be6deaca16..872ab0fed31 100644
--- a/regress/sys/kern/sosplice/Makefile.inc
+++ b/regress/sys/kern/sosplice/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2013/08/09 19:51:11 bluhm Exp $
+#	$OpenBSD: Makefile.inc,v 1.4 2019/07/12 19:31:29 bluhm Exp $
 
 # The following ports must be installed for the regression tests:
 # p5-BSD-Socket-Splice	perl interface to OpenBSD socket splicing
@@ -35,14 +35,14 @@ REMOTE_SSH ?=
 ARGS !=			cd ${.CURDIR} && ls args-*.pl
 TARGETS ?=		${ARGS}
 .endif
-REGRESS_TARGETS =	${TARGETS:S/^/run-regress-/}
+REGRESS_TARGETS =	${TARGETS:S/^/run-/}
 CLEANFILES +=		*.log ktrace.out stamp-*
 
 # Set variables so that make runs with and without obj directory.
 # Only do that if necessary to keep visible output short.
 
 .if ${.CURDIR} == ${.OBJDIR}
-PERLINC =	-I..
+PERLINC =	-I.. -I.
 PERLPATH =
 .else
 PERLINC =	-I${.CURDIR}/..
diff --git a/regress/sys/kern/sosplice/error/Makefile b/regress/sys/kern/sosplice/error/Makefile
index b5de3e16858..9f41be0534c 100644
--- a/regress/sys/kern/sosplice/error/Makefile
+++ b/regress/sys/kern/sosplice/error/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2014/07/11 20:41:20 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.3 2019/07/12 19:31:29 bluhm Exp $
 
 .include <bsd.regress.mk>
 
@@ -6,7 +6,7 @@
 # kernel error code.
 
 .for a in ${ARGS}
-run-regress-$a: $a
+run-$a: $a
 	@echo '\n======== $@ ========'
 .if empty (REMOTE_SSH)
 	time perl ${PERLINC} ${PERLPATH}error.pl ${PERLPATH}$a
diff --git a/regress/sys/kern/sosplice/perf/Makefile b/regress/sys/kern/sosplice/perf/Makefile
index 8ccf4939c5c..047d4075f99 100644
--- a/regress/sys/kern/sosplice/perf/Makefile
+++ b/regress/sys/kern/sosplice/perf/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2016/08/29 16:25:14 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.7 2019/07/12 19:31:29 bluhm Exp $
 
 PROG ?=		relay
 CFLAGS +=	-Wall -Werror
@@ -24,7 +24,7 @@ remote-setup:
 .for p in tcp udp
 .for r in copy splice
 
-run-regress-$p-$r: $r remote-setup
+run-$p-$r: $r remote-setup
 	@echo '\n======== $@ ========'
 	-pkill -x tcpbench
 .if empty (REMOTE_SSH)
@@ -36,7 +36,7 @@ run-regress-$p-$r: $r remote-setup
 	kill $$rpid ; \
 	pkill -x tcpbench
 .else
-	ssh -f ${REMOTE_SSH} 'cd ${.CURDIR} && make PROG= LOCAL_ADDR=${LOCAL_ADDR} REMOTE_ADDR=${REMOTE_ADDR} remote-regress-$p-$r' ; \
+	ssh -f ${REMOTE_SSH} 'cd ${.CURDIR} && make PROG= LOCAL_ADDR=${LOCAL_ADDR} REMOTE_ADDR=${REMOTE_ADDR} remote-$p-$r' ; \
 	sleep 2 ; \
 	tcpbench ${p:S/tcp//:S/udp/-u/} -t 7 -b ${LOCAL_ADDR} -s -p 12346 & \
 	sleep 1 ; \
@@ -45,7 +45,7 @@ run-regress-$p-$r: $r remote-setup
 .endif
 	sleep 1
 
-remote-regress-$p-$r: $r
+remote-$p-$r: $r
 	-pkill -x $r
 	./$r ${p:S/tcp//:S/udp/-u/} -b ${REMOTE_ADDR} 12345 ${LOCAL_ADDR} 12346 & \
 	rpid=$$! ; \
diff --git a/regress/sys/kern/sosplice/tcp/Makefile b/regress/sys/kern/sosplice/tcp/Makefile
index b791a1a4820..80474fb58a9 100644
--- a/regress/sys/kern/sosplice/tcp/Makefile
+++ b/regress/sys/kern/sosplice/tcp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2014/07/11 20:41:20 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.3 2019/07/12 19:31:29 bluhm Exp $
 
 .include <bsd.regress.mk>
 
@@ -12,7 +12,7 @@
 # copy relay or with a kernel socket splicing relay.
 
 .for a in ${ARGS}
-run-regress-$a: $a
+run-$a: $a
 	@echo '\n======== $@ ========'
 .if empty (REMOTE_SSH)
 	time perl ${PERLINC} ${PERLPATH}relay.pl copy ${PERLPATH}$a
diff --git a/regress/sys/kern/sosplice/udp/Makefile b/regress/sys/kern/sosplice/udp/Makefile
index 487a369ba5b..c83a8719491 100644
--- a/regress/sys/kern/sosplice/udp/Makefile
+++ b/regress/sys/kern/sosplice/udp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2014/07/11 20:41:20 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.3 2019/07/12 19:31:29 bluhm Exp $
 
 .include <bsd.regress.mk>
 
@@ -11,7 +11,7 @@
 # relay.
 
 .for a in ${ARGS}
-run-regress-$a: $a
+run-$a: $a
 	@echo '\n======== $@ ========'
 .if empty (REMOTE_SSH)
 	time perl ${PERLINC} ${PERLPATH}relay.pl copy ${PERLPATH}$a
diff --git a/regress/sys/net/pf_divert/Makefile b/regress/sys/net/pf_divert/Makefile
index c708b9da214..6c218053c0b 100644
--- a/regress/sys/net/pf_divert/Makefile
+++ b/regress/sys/net/pf_divert/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2019/06/04 11:01:33 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.22 2019/07/12 19:31:29 bluhm Exp $
 
 # The following ports must be installed for the regression tests:
 # p5-IO-Socket-INET6	object interface for AF_INET and AF_INET6 domain sockets
@@ -90,7 +90,7 @@ TARGETS ?=		\
 	inet-reuse-rip-reply-to-reply-to inet6-reuse-rip-reply-to-reply-to \
 	inet-args-udp-packet-in inet6-args-udp-packet-in \
 	inet-args-udp-packet-out inet6-args-udp-packet-out
-REGRESS_TARGETS =	${TARGETS:S/^/run-regress-/}
+REGRESS_TARGETS =	${TARGETS:S/^/run-/}
 CLEANFILES +=		*.log *.port *.ktrace ktrace.out stamp-*
 
 .MAIN: all
@@ -130,13 +130,13 @@ PERLPATH =	${.CURDIR}/
 
 .for  inet addr  in  inet ADDR  inet6 ADDR6
 
-run-regress-${inet}-reuse-rip-to-reply-to:
+run-${inet}-reuse-rip-to-reply-to:
 	@echo '\n======== $@ ========'
 	@echo 'rip to before reply is broken, it does not remove the state.'
 	@echo DISABLED
 
 .for a in ${ARGS}
-run-regress-${inet}-${a:R}: ${a}
+run-${inet}-${a:R}: ${a}
 	@echo '\n======== $@ ========'
 .if ${@:M*-packet-*}
 	time ${SUDO} SUDO=${SUDO} KTRACE=${KTRACE} \
@@ -165,7 +165,7 @@ STATE_EXIST_rip_reply-to =	!
 
 .for  first second  in  to to  to reply  to reply-to  reply to  reply reply  reply reply-to  reply-to to  reply-to reply  reply-to reply-to
 
-run-regress-${inet}-reuse-${proto}-${first}-${second}:
+run-${inet}-reuse-${proto}-${first}-${second}:
 	@echo '\n======== $@ ========'
 	# create state with ${first} divert rule
 	time ${SUDO} SUDO=${SUDO} KTRACE=${KTRACE} \