MFC various moves of tools/regressions/ tests to the new infrastructure.

- r263220 Migrate tools/regression/sbin/ to the new tests layout. - r263222 Add Makefile missed in r263220. - r263226 Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new tests layout. - r263227 Migrate most of tools/regression/usr.bin/ to the new tests layout. - r263345 Expand tabs that sneaked in into spaces. - r263346 Migrate tools/regression/usr.bin/make/ to the new tests layout. - r263348 Add Makefiles missed in r263346. - r263351 Migrate tools/regression/usr.bin/pkill/ to the new tests layout. - r263388 Mark multi_test as requiring /usr/share/dict/words. - r263814 Fix path to the run.pl script to let these tests run. - r264742 Prevent building tests when bootstrapping make. This is 'make tinderbox' clean.
author: jmmv <jmmv@FreeBSD.org> 2014-04-27 01:15:10 +0000
committer: jmmv <jmmv@FreeBSD.org> 2014-04-27 01:15:10 +0000
commit: 1e4589b921fdaa1b1d2fc6b6ed016f1e0a01cb8f (patch)
tree: 94c86cf13dedabad5bdc68f6f227b843a5161343
parent: 5b12da65bf9d40526ac9ca480d639bad3cd39cf6 (diff)
download: FreeBSD-src-1e4589b921fdaa1b1d2fc6b6ed016f1e0a01cb8f.zip
FreeBSD-src-1e4589b921fdaa1b1d2fc6b6ed016f1e0a01cb8f.tar.gz
1024 files changed, 2686 insertions, 781 deletions
diff --git a/Makefile b/Makefile
index cd5f3ee..ab8f6b1 100644
--- a/Makefile
+++ b/Makefile
@@ -345,7 +345,8 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MYMAKE:H} \
 MMAKE=		${MMAKEENV} ${MAKE} \
 		-D_UPGRADING \
 		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T}
+		-DNO_CPU_CFLAGS -DNO_WERROR \
+		DESTDIR= MK_TESTS=no PROGNAME=${MYMAKE:T}
 
 make bmake: .PHONY
 	@echo
diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile
index e98ed2c..bb4d865 100644
--- a/bin/pkill/Makefile
+++ b/bin/pkill/Makefile
@@ -1,6 +1,8 @@
 #	$NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	pkill
 
 DPADD=	${LIBKVM}
@@ -17,4 +19,8 @@ MLINKS=	pkill.1 pgrep.1
 SYMLINKS=	${BINDIR}/pkill /usr/bin/pkill
 SYMLINKS+=	${BINDIR}/pgrep /usr/bin/pgrep
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile
new file mode 100644
index 0000000..b131d59
--- /dev/null
+++ b/bin/pkill/tests/Makefile
@@ -0,0 +1,38 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/bin/pkill
+
+TAP_TESTS_SH=			pgrep-F_test
+TAP_TESTS_SH+=			pgrep-LF_test
+TAP_TESTS_SH+=			pgrep-P_test
+TAP_TESTS_SH+=			pgrep-U_test
+TAP_TESTS_SH+=			pgrep-_g_test
+TAP_TESTS_SH+=			pgrep-_s_test
+TAP_TESTS_SH+=			pgrep-g_test
+TAP_TESTS_SH+=			pgrep-i_test
+TAP_TESTS_SH+=			pgrep-j_test
+TEST_METADATA.pgrep-j_test+=	required_user="root"
+TAP_TESTS_SH+=			pgrep-l_test
+TAP_TESTS_SH+=			pgrep-n_test
+TAP_TESTS_SH+=			pgrep-o_test
+TAP_TESTS_SH+=			pgrep-q_test
+TAP_TESTS_SH+=			pgrep-s_test
+TAP_TESTS_SH+=			pgrep-t_test
+TAP_TESTS_SH+=			pgrep-v_test
+TAP_TESTS_SH+=			pgrep-x_test
+TAP_TESTS_SH+=			pkill-F_test
+TAP_TESTS_SH+=			pkill-LF_test
+TAP_TESTS_SH+=			pkill-P_test
+TAP_TESTS_SH+=			pkill-U_test
+TAP_TESTS_SH+=			pkill-_g_test
+TAP_TESTS_SH+=			pkill-g_test
+TAP_TESTS_SH+=			pkill-i_test
+TAP_TESTS_SH+=			pkill-j_test
+TEST_METADATA.pkill-j_test+=	required_user="root"
+TAP_TESTS_SH+=			pkill-s_test
+TAP_TESTS_SH+=			pkill-t_test
+TAP_TESTS_SH+=			pkill-x_test
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/pkill/pgrep-F.t b/bin/pkill/tests/pgrep-F_test.sh
index fd76e64..4d8feaa 100644
--- a/tools/regression/usr.bin/pkill/pgrep-F.t
+++ b/bin/pkill/tests/pgrep-F_test.sh
@@ -6,8 +6,8 @@ base=`basename $0`
 echo "1..1"
 
 name="pgrep -F <pidfile>"
-pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+pidfile=$(pwd)/pidfile.txt
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-LF.t b/bin/pkill/tests/pgrep-LF_test.sh
index d981175..4818869 100644
--- a/tools/regression/usr.bin/pkill/pgrep-LF.t
+++ b/bin/pkill/tests/pgrep-LF_test.sh
@@ -6,8 +6,8 @@ base=`basename $0`
 echo "1..2"
 
 name="pgrep -LF <pidfile>"
-pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+pidfile=$(pwd)/pidfile.txt
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 daemon -p $pidfile $sleep 5
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-P.t b/bin/pkill/tests/pgrep-P_test.sh
index d139edb..5a5cdcf 100644
--- a/tools/regression/usr.bin/pkill/pgrep-P.t
+++ b/bin/pkill/tests/pgrep-P_test.sh
@@ -7,7 +7,7 @@ echo "1..1"
 
 name="pgrep -P <ppid>"
 ppid=$$
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-U.t b/bin/pkill/tests/pgrep-U_test.sh
index 7cc865a..2e7f24d 100644
--- a/tools/regression/usr.bin/pkill/pgrep-U.t
+++ b/bin/pkill/tests/pgrep-U_test.sh
@@ -7,7 +7,7 @@ echo "1..2"
 
 name="pgrep -U <uid>"
 ruid=`id -ur`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
@@ -23,7 +23,7 @@ rm -f $sleep
 
 name="pgrep -U <user>"
 ruid=`id -urn`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-_g.t b/bin/pkill/tests/pgrep-_g_test.sh
index b07b608..fbe7b08 100644
--- a/tools/regression/usr.bin/pkill/pgrep-_g.t
+++ b/bin/pkill/tests/pgrep-_g_test.sh
@@ -7,7 +7,7 @@ echo "1..2"
 
 name="pgrep -G <gid>"
 rgid=`id -gr`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
@@ -23,7 +23,7 @@ rm -f $sleep
 
 name="pgrep -G <group>"
 rgid=`id -grn`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-_s.t b/bin/pkill/tests/pgrep-_s_test.sh
index ce0bde3..ce0bde3 100644
--- a/tools/regression/usr.bin/pkill/pgrep-_s.t
+++ b/bin/pkill/tests/pgrep-_s_test.sh
diff --git a/tools/regression/usr.bin/pkill/pgrep-g.t b/bin/pkill/tests/pgrep-g_test.sh
index 19bd774..1414908 100644
--- a/tools/regression/usr.bin/pkill/pgrep-g.t
+++ b/bin/pkill/tests/pgrep-g_test.sh
@@ -7,7 +7,7 @@ echo "1..2"
 
 name="pgrep -g <pgrp>"
 pgrp=`ps -o tpgid -p $$ | tail -1`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
@@ -22,7 +22,7 @@ kill $chpid
 rm -f $sleep
 
 name="pgrep -g 0"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-i.t b/bin/pkill/tests/pgrep-i_test.sh
index cbf36ff..b9ecfbc 100644
--- a/tools/regression/usr.bin/pkill/pgrep-i.t
+++ b/bin/pkill/tests/pgrep-i_test.sh
@@ -6,7 +6,7 @@ base=`basename $0`
 echo "1..1"
 
 name="pgrep -i"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 usleep="${sleep}XXX"
 touch $usleep
 lsleep="${sleep}xxx"
diff --git a/tools/regression/usr.bin/pkill/pgrep-j.t b/bin/pkill/tests/pgrep-j_test.sh
index 861d575..6656a9b 100644
--- a/tools/regression/usr.bin/pkill/pgrep-j.t
+++ b/bin/pkill/tests/pgrep-j_test.sh
@@ -7,7 +7,7 @@ echo "1..3"
 
 name="pgrep -j <jid>"
 if [ `id -u` -eq 0 ]; then
-	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
 	jail / $base-1 127.0.0.1 $sleep 5 &
 	chpid=$!
@@ -31,7 +31,7 @@ fi
 
 name="pgrep -j any"
 if [ `id -u` -eq 0 ]; then
-	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
 	jail / $base-1 127.0.0.1 $sleep 5 &
 	chpid=$!
@@ -55,7 +55,7 @@ fi
 
 name="pgrep -j none"
 if [ `id -u` -eq 0 ]; then
-	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
 	$sleep 5 &
 	chpid=$!
diff --git a/tools/regression/usr.bin/pkill/pgrep-l.t b/bin/pkill/tests/pgrep-l_test.sh
index 3be3402..49273b3 100644
--- a/tools/regression/usr.bin/pkill/pgrep-l.t
+++ b/bin/pkill/tests/pgrep-l_test.sh
@@ -6,7 +6,7 @@ base=`basename $0`
 echo "1..1"
 
 name="pgrep -l"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-n.t b/bin/pkill/tests/pgrep-n_test.sh
index cde95fb..1b6fe83 100644
--- a/tools/regression/usr.bin/pkill/pgrep-n.t
+++ b/bin/pkill/tests/pgrep-n_test.sh
@@ -6,7 +6,7 @@ base=`basename $0`
 echo "1..1"
 
 name="pgrep -n"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 oldpid=$!
diff --git a/tools/regression/usr.bin/pkill/pgrep-o.t b/bin/pkill/tests/pgrep-o_test.sh
index 2b1cf51..250f230 100644
--- a/tools/regression/usr.bin/pkill/pgrep-o.t
+++ b/bin/pkill/tests/pgrep-o_test.sh
@@ -6,7 +6,7 @@ base=`basename $0`
 echo "1..1"
 
 name="pgrep -o"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 oldpid=$!
diff --git a/tools/regression/usr.bin/pkill/pgrep-q.t b/bin/pkill/tests/pgrep-q_test.sh
index 02a89fc..2626a5e 100644
--- a/tools/regression/usr.bin/pkill/pgrep-q.t
+++ b/bin/pkill/tests/pgrep-q_test.sh
@@ -6,8 +6,8 @@ base=`basename $0`
 echo "1..4"
 
 name="pgrep -q"
-sleep0=`mktemp /tmp/$base.XXXXXX` || exit 1
-sleep1=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep0=$(pwd)/sleep0.txt
+sleep1=$(pwd)/sleep1.txt
 ln -sf /bin/sleep $sleep0
 $sleep0 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-s.t b/bin/pkill/tests/pgrep-s_test.sh
index b9d3969..82c1ef9 100644
--- a/tools/regression/usr.bin/pkill/pgrep-s.t
+++ b/bin/pkill/tests/pgrep-s_test.sh
@@ -7,7 +7,7 @@ echo "1..2"
 
 name="pgrep -s <sid>"
 sid=`ps -o tsid -p $$ | tail -1`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
@@ -22,7 +22,7 @@ kill $chpid
 rm -f $sleep
 
 name="pgrep -s 0"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-t.t b/bin/pkill/tests/pgrep-t_test.sh
index c1d0c2a..a8527d5 100644
--- a/tools/regression/usr.bin/pkill/pgrep-t.t
+++ b/bin/pkill/tests/pgrep-t_test.sh
@@ -6,8 +6,8 @@ base=`basename $0`
 echo "1..2"
 
 name="pgrep -t <tty>"
-tty=`ps -o tty -p $$ | tail -1`
-if [ "$tty" = "??" ]; then
+tty=`ps -x -o tty -p $$ | tail -1`
+if [ "$tty" = "??" -o "$tty" = "-" ]; then
 	tty="-"
 	ttyshort="-"
 else
@@ -16,7 +16,7 @@ else
 	*)	ttyshort=`echo $tty | cut -c 4-` ;;
 	esac
 fi
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-v.t b/bin/pkill/tests/pgrep-v_test.sh
index 11a2be2..b9835bc 100644
--- a/tools/regression/usr.bin/pkill/pgrep-v.t
+++ b/bin/pkill/tests/pgrep-v_test.sh
@@ -6,7 +6,7 @@ base=`basename $0`
 echo "1..2"
 
 name="pgrep -v"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pgrep-x.t b/bin/pkill/tests/pgrep-x_test.sh
index 8906664..1defde2 100644
--- a/tools/regression/usr.bin/pkill/pgrep-x.t
+++ b/bin/pkill/tests/pgrep-x_test.sh
@@ -6,7 +6,7 @@ base=`basename $0`
 echo "1..4"
 
 name="pgrep -x"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pkill-F.t b/bin/pkill/tests/pkill-F_test.sh
index 732d807..48ad474 100644
--- a/tools/regression/usr.bin/pkill/pkill-F.t
+++ b/bin/pkill/tests/pkill-F_test.sh
@@ -6,8 +6,8 @@ base=`basename $0`
 echo "1..1"
 
 name="pkill -F <pidfile>"
-pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+pidfile=$(pwd)/pidfile.txt
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pkill-LF.t b/bin/pkill/tests/pkill-LF_test.sh
index adb6ba9..fcafd0a 100644
--- a/tools/regression/usr.bin/pkill/pkill-LF.t
+++ b/bin/pkill/tests/pkill-LF_test.sh
@@ -6,8 +6,8 @@ base=`basename $0`
 echo "1..2"
 
 name="pkill -LF <pidfile>"
-pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+pidfile=$(pwd)/pidfile.txt
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 daemon -p $pidfile $sleep 5
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pkill-P.t b/bin/pkill/tests/pkill-P_test.sh
index 4b8ddb5..2030710 100644
--- a/tools/regression/usr.bin/pkill/pkill-P.t
+++ b/bin/pkill/tests/pkill-P_test.sh
@@ -7,7 +7,7 @@ echo "1..1"
 
 name="pkill -P <ppid>"
 ppid=$$
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pkill-U.t b/bin/pkill/tests/pkill-U_test.sh
index 16313f8..04395e5 100644
--- a/tools/regression/usr.bin/pkill/pkill-U.t
+++ b/bin/pkill/tests/pkill-U_test.sh
@@ -7,7 +7,7 @@ echo "1..2"
 
 name="pkill -U <uid>"
 ruid=`id -ur`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
@@ -25,7 +25,7 @@ rm -f $sleep
 
 name="pkill -U <user>"
 ruid=`id -urn`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pkill-_g.t b/bin/pkill/tests/pkill-_g_test.sh
index 0717cea..1739ac8 100644
--- a/tools/regression/usr.bin/pkill/pkill-_g.t
+++ b/bin/pkill/tests/pkill-_g_test.sh
@@ -7,7 +7,7 @@ echo "1..2"
 
 name="pkill -G <gid>"
 rgid=`id -gr`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
@@ -25,7 +25,7 @@ rm -f $sleep
 
 name="pkill -G <group>"
 rgid=`id -grn`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pkill-g.t b/bin/pkill/tests/pkill-g_test.sh
index d00adac..29d6ab7 100644
--- a/tools/regression/usr.bin/pkill/pkill-g.t
+++ b/bin/pkill/tests/pkill-g_test.sh
@@ -7,7 +7,7 @@ echo "1..2"
 
 name="pkill -g <pgrp>"
 pgrp=`ps -o tpgid -p $$ | tail -1`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
@@ -24,7 +24,7 @@ esac
 rm -f $sleep
 
 name="pkill -g 0"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pkill-i.t b/bin/pkill/tests/pkill-i_test.sh
index 6574cbd..b9b8df8 100644
--- a/tools/regression/usr.bin/pkill/pkill-i.t
+++ b/bin/pkill/tests/pkill-i_test.sh
@@ -6,7 +6,7 @@ base=`basename $0`
 echo "1..1"
 
 name="pkill -i"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 usleep="${sleep}XXX"
 touch $usleep
 lsleep="${sleep}xxx"
diff --git a/tools/regression/usr.bin/pkill/pkill-j.t b/bin/pkill/tests/pkill-j_test.sh
index 5cb03115..48e7c72 100644
--- a/tools/regression/usr.bin/pkill/pkill-j.t
+++ b/bin/pkill/tests/pkill-j_test.sh
@@ -7,7 +7,7 @@ echo "1..3"
 
 name="pkill -j <jid>"
 if [ `id -u` -eq 0 ]; then
-	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
 	jail / $base-1 127.0.0.1 $sleep 5 &
 	chpid=$!
@@ -30,7 +30,7 @@ fi
 
 name="pkill -j any"
 if [ `id -u` -eq 0 ]; then
-	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
 	jail / $base-1 127.0.0.1 $sleep 5 &
 	chpid=$!
@@ -52,7 +52,7 @@ fi
 
 name="pkill -j none"
 if [ `id -u` -eq 0 ]; then
-	sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
 	$sleep 5 &
 	chpid=$!
diff --git a/tools/regression/usr.bin/pkill/pkill-s.t b/bin/pkill/tests/pkill-s_test.sh
index 5fc4dc6..0a9587b 100644
--- a/tools/regression/usr.bin/pkill/pkill-s.t
+++ b/bin/pkill/tests/pkill-s_test.sh
@@ -7,7 +7,7 @@ echo "1..2"
 
 name="pkill -s <sid>"
 sid=`ps -o tsid -p $$ | tail -1`
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
@@ -24,7 +24,7 @@ esac
 rm -f $sleep
 
 name="pkill -s 0"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pkill-t.t b/bin/pkill/tests/pkill-t_test.sh
index 84a66c3..07f511b 100644
--- a/tools/regression/usr.bin/pkill/pkill-t.t
+++ b/bin/pkill/tests/pkill-t_test.sh
@@ -6,8 +6,8 @@ base=`basename $0`
 echo "1..2"
 
 name="pkill -t <tty>"
-tty=`ps -o tty -p $$ | tail -1`
-if [ "$tty" = "??" ]; then
+tty=`ps -x -o tty -p $$ | tail -1`
+if [ "$tty" = "??" -o "$tty" = "-" ]; then
 	tty="-"
 	ttyshort="-"
 else
@@ -16,7 +16,7 @@ else
 	*)	ttyshort=`echo $tty | cut -c 4-` ;;
 	esac
 fi
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/tools/regression/usr.bin/pkill/pkill-x.t b/bin/pkill/tests/pkill-x_test.sh
index 61d5d5b..5ff0d68 100644
--- a/tools/regression/usr.bin/pkill/pkill-x.t
+++ b/bin/pkill/tests/pkill-x_test.sh
@@ -6,7 +6,7 @@ base=`basename $0`
 echo "1..4"
 
 name="pkill -x"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
@@ -25,7 +25,7 @@ fi
 rm -f $sleep
 
 name="pkill -x -f"
-sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
+sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index eefb94a..5035042 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -29,6 +29,8 @@
             ..
             pax
             ..
+            pkill
+            ..
             sh
                 builtins
                 ..
@@ -70,6 +72,14 @@
                 ..
             ..
         ..
+        sbin
+            dhclient
+            ..
+            growfs
+            ..
+            mdconfig
+            ..
+        ..
         share
             examples
                 tests
@@ -85,10 +95,150 @@
             ..
         ..
         usr.bin
+            apply
+            ..
             atf
                 atf-sh
                 ..
             ..
+            calendar
+            ..
+            comm
+            ..
+            file2c
+            ..
+            join
+            ..
+            jot
+            ..
+            lastcomm
+            ..
+            m4
+            ..
+            make
+                archives
+                    fmt_44bsd
+                    ..
+                    fmt_44bsd_mod
+                    ..
+                    fmt_oldbsd
+                    ..
+                ..
+                basic
+                    t0
+                    ..
+                    t1
+                    ..
+                    t2
+                    ..
+                    t3
+                    ..
+                ..
+                execution
+                    ellipsis
+                    ..
+                    empty
+                    ..
+                    joberr
+                    ..
+                    plus
+                    ..
+                ..
+                shell
+                    builtin
+                    ..
+                    meta
+                    ..
+                    path
+                    ..
+                    path_select
+                    ..
+                    replace
+                    ..
+                    select
+                    ..
+                ..
+                suffixes
+                    basic
+                    ..
+                    src_wild1
+                    ..
+                    src_wild2
+                    ..
+                ..
+                syntax
+                    directive-t0
+                    ..
+                    enl
+                    ..
+                    funny-targets
+                    ..
+                    semi
+                    ..
+                ..
+                sysmk
+                    t0
+                        2
+                            1
+                            ..
+                        ..
+                        mk
+                        ..
+                    ..
+                    t1
+                        2
+                            1
+                            ..
+                        ..
+                        mk
+                        ..
+                    ..
+                    t2
+                        2
+                            1
+                            ..
+                        ..
+                        mk
+                        ..
+                    ..
+                ..
+                variables
+                    modifier_M
+                    ..
+                    modifier_t
+                    ..
+                    opt_V
+                    ..
+                    t0
+                    ..
+                ..
+            ..
+            ncal
+            ..
+            printf
+            ..
+            sed
+                regress.multitest.out
+                ..
+            ..
+            tr
+            ..
+            uudecode
+            ..
+            uuencode
+            ..
+            xargs
+            ..
+            yacc
+            ..
+        ..
+        usr.sbin
+            etcupdate
+            ..
+            newsyslog
+            ..
+            sa
+            ..
         ..
     ..
 ..
diff --git a/sbin/Makefile b/sbin/Makefile
index c6c3786..cad3219 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -114,6 +114,10 @@ SUBDIR+=	quotacheck
 SUBDIR+=	routed
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.arch.inc.mk>
 
 SUBDIR:=	${SUBDIR:O}
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 74d1c4d..57c9211 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -31,6 +31,8 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+.include <bsd.own.mk>
+
 SRCS=	dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \
 	tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \
 	parse.c privsep.c
@@ -44,4 +46,8 @@ LDADD=	-lutil
 
 WARNS?=	2
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile
new file mode 100644
index 0000000..b092eea
--- /dev/null
+++ b/sbin/dhclient/tests/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sbin/dhclient
+
+.PATH:	${.CURDIR}/..
+
+PLAIN_TESTS_C=				option-domain-search_test
+SRCS.option-domain-search_test=		alloc.c convert.c hash.c options.c \
+					tables.c fake.c option-domain-search.c
+CFLAGS.option-domain-search_test+=	-I${.CURDIR}/..
+LDADD.option-domain-search_test=	-lutil
+
+WARNS?=	2
+
+.include <bsd.test.mk>
diff --git a/tools/regression/sbin/dhclient/fake.c b/sbin/dhclient/tests/fake.c
index c204d49..c204d49 100644
--- a/tools/regression/sbin/dhclient/fake.c
+++ b/sbin/dhclient/tests/fake.c
diff --git a/tools/regression/sbin/dhclient/option-domain-search.c b/sbin/dhclient/tests/option-domain-search.c
index b79f9a5..b79f9a5 100644
--- a/tools/regression/sbin/dhclient/option-domain-search.c
+++ b/sbin/dhclient/tests/option-domain-search.c
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index f464ed7..58ce41d 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -6,6 +6,8 @@
 
 #GFSDBG=
 
+.include <bsd.own.mk>
+
 .PATH:	${.CURDIR}/../mount
 
 PROG=   growfs
@@ -20,4 +22,8 @@ SRCS+=  debug.c
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>      
diff --git a/sbin/growfs/tests/Makefile b/sbin/growfs/tests/Makefile
new file mode 100644
index 0000000..7a6a831
--- /dev/null
+++ b/sbin/growfs/tests/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sbin/growfs
+
+TAP_TESTS_PERL=	legacy_test
+
+.include <bsd.test.mk>
diff --git a/tools/regression/sbin/growfs/regress.t b/sbin/growfs/tests/legacy_test.pl
index 9dbdd85..7316951 100755
--- a/tools/regression/sbin/growfs/regress.t
+++ b/sbin/growfs/tests/legacy_test.pl
@@ -1,5 +1,3 @@
-#! /usr/bin/perl
-#
 # $FreeBSD$
 
 use strict;
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index be8b1b5..4b9b940 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		mdconfig
 MAN=		mdconfig.8
 
 DPADD=	${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} 
 LDADD=	-lutil -lgeom -lbsdxml -lsbuf
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/sbin/mdconfig/tests/Makefile b/sbin/mdconfig/tests/Makefile
new file mode 100644
index 0000000..17284bb
--- /dev/null
+++ b/sbin/mdconfig/tests/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sbin/mdconfig
+
+TAP_TESTS_SH=			legacy_test
+TAP_TESTS_SH_SED_legacy_test=   's,__PERL__,${TAP_PERL_INTERPRETER},g'
+TEST_METADATA.legacy_test+=	required_programs="${TAP_PERL_INTERPRETER}"
+
+FILESDIR=	${TESTSDIR}
+FILES=		mdconfig.test
+FILES+=		run.pl
+
+.include <bsd.test.mk>
diff --git a/tools/regression/sbin/mdconfig/00.t b/sbin/mdconfig/tests/legacy_test.sh
index 04e6d00..728224d 100644
--- a/tools/regression/sbin/mdconfig/00.t
+++ b/sbin/mdconfig/tests/legacy_test.sh
@@ -38,7 +38,7 @@ fi
 
 TESTDIR=$(dirname $(realpath $0))
 
-perl $TESTDIR/run $TESTDIR/mdconfig.test > /dev/null
+__PERL__ -w -U $TESTDIR/run.pl $TESTDIR/mdconfig.test > /dev/null
 
 if [ $? -eq 0 ]; then
 	echo "ok 1"
diff --git a/tools/regression/sbin/mdconfig/mdconfig.test b/sbin/mdconfig/tests/mdconfig.test
index 65d3670..65d3670 100644
--- a/tools/regression/sbin/mdconfig/mdconfig.test
+++ b/sbin/mdconfig/tests/mdconfig.test
diff --git a/tools/regression/sbin/mdconfig/run b/sbin/mdconfig/tests/run.pl
index 383f47e..383f47e 100755..100644
--- a/tools/regression/sbin/mdconfig/run
+++ b/sbin/mdconfig/tests/run.pl
diff --git a/sbin/tests/Makefile b/sbin/tests/Makefile
new file mode 100644
index 0000000..a298f87
--- /dev/null
+++ b/sbin/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/sbin
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index cc66ef4..0f3a8e2 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4092,6 +4092,376 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
+.if ${MK_MAKE} == yes && ${MK_BMAKE} == yes
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/shell
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/shell
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST2.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST2.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/cleanup
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/cleanup
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/common.sh
+OLD_FILES+=usr/tests/usr.bin/make/test-new.mk
+OLD_DIRS+=usr/tests/usr.bin/make/variables/t0
+OLD_DIRS+=usr/tests/usr.bin/make/variables/opt_V
+OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_t
+OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_M
+OLD_DIRS+=usr/tests/usr.bin/make/variables
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/semi
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/funny-targets
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/enl
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/directive-t0
+OLD_DIRS+=usr/tests/usr.bin/make/syntax
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild2
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild1
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/basic
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes
+OLD_DIRS+=usr/tests/usr.bin/make/shell/select
+OLD_DIRS+=usr/tests/usr.bin/make/shell/replace
+OLD_DIRS+=usr/tests/usr.bin/make/shell/path_select
+OLD_DIRS+=usr/tests/usr.bin/make/shell/path
+OLD_DIRS+=usr/tests/usr.bin/make/shell/meta
+OLD_DIRS+=usr/tests/usr.bin/make/shell/builtin
+OLD_DIRS+=usr/tests/usr.bin/make/shell
+OLD_DIRS+=usr/tests/usr.bin/make/execution/plus
+OLD_DIRS+=usr/tests/usr.bin/make/execution/joberr
+OLD_DIRS+=usr/tests/usr.bin/make/execution/empty
+OLD_DIRS+=usr/tests/usr.bin/make/execution/ellipsis
+OLD_DIRS+=usr/tests/usr.bin/make/execution
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t3
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t2
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t1
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t0
+OLD_DIRS+=usr/tests/usr.bin/make/basic
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_oldbsd
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd
+OLD_DIRS+=usr/tests/usr.bin/make/archives
+OLD_DIRS+=usr/tests/usr.bin/make
+.endif
 .else
 # ATF libraries.
 OLD_FILES+=usr/bin/atf-sh
diff --git a/tools/regression/sbin/Makefile b/tools/regression/sbin/Makefile
deleted file mode 100644
index 623ff62..0000000
--- a/tools/regression/sbin/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	dhclient growfs
-
-.include <bsd.subdir.mk>
diff --git a/tools/regression/sbin/dhclient/Makefile b/tools/regression/sbin/dhclient/Makefile
deleted file mode 100644
index a9c876e..0000000
--- a/tools/regression/sbin/dhclient/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../../../sbin/dhclient
-
-SRCS=	alloc.c convert.c hash.c options.c tables.c			\
-	fake.c								\
-	option-domain-search.c
-
-CFLAGS+= -I${.CURDIR}/../../../../sbin/dhclient
-LDADD=	-lutil
-
-PROG=	option-domain-search
-
-NO_MAN=
-WARNS?=	2
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sbin/growfs/Makefile b/tools/regression/sbin/growfs/Makefile
deleted file mode 100644
index dc9fa67..0000000
--- a/tools/regression/sbin/growfs/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-all test:
-	prove -vmw regress.t
-
-clean:
diff --git a/tools/regression/usr.bin/Makefile b/tools/regression/usr.bin/Makefile
deleted file mode 100644
index 7538f23..0000000
--- a/tools/regression/usr.bin/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	apply calendar comm file2c join jot m4 ncal printf sed tr	\
-	uudecode uuencode xargs
-.if !defined(AUTOMATED)
-SUBDIR+= lastcomm
-.endif
-
-.include <bsd.subdir.mk>
diff --git a/tools/regression/usr.bin/apply/Makefile b/tools/regression/usr.bin/apply/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/apply/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/apply/regress.sh b/tools/regression/usr.bin/apply/regress.sh
deleted file mode 100644
index 7cbaae3..0000000
--- a/tools/regression/usr.bin/apply/regress.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-echo 1..2
-
-REGRESSION_START($1)
-
-REGRESSION_TEST(`00', `apply "echo %1 %1 %1 %1" $(cat regress.00.in)')
-REGRESSION_TEST(`01', `sh regress.01.sh')
-
-REGRESSION_END()
diff --git a/tools/regression/usr.bin/apply/regress.t b/tools/regression/usr.bin/apply/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/apply/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/calendar/Makefile b/tools/regression/usr.bin/calendar/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/calendar/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/calendar/regress.t b/tools/regression/usr.bin/calendar/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/calendar/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/comm/Makefile b/tools/regression/usr.bin/comm/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/comm/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/comm/regress.sh b/tools/regression/usr.bin/comm/regress.sh
deleted file mode 100644
index 774093f..0000000
--- a/tools/regression/usr.bin/comm/regress.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-LC_ALL=C; export LC_ALL
-
-echo 1..3
-
-REGRESSION_START($1)
-
-REGRESSION_TEST(`00', `comm -12 regress.00a.in regress.00b.in')
-REGRESSION_TEST(`01', `comm -12 regress.01a.in regress.01b.in')
-REGRESSION_TEST(`02', `comm regress.02a.in regress.02b.in')
-
-REGRESSION_END()
diff --git a/tools/regression/usr.bin/comm/regress.t b/tools/regression/usr.bin/comm/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/comm/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/file2c/Makefile b/tools/regression/usr.bin/file2c/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/file2c/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/file2c/regress.sh b/tools/regression/usr.bin/file2c/regress.sh
deleted file mode 100644
index 4492e91..0000000
--- a/tools/regression/usr.bin/file2c/regress.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-echo 1..9
-
-REGRESSION_START($1)
-
-REGRESSION_TEST(`1', `head -c 13 regress.in | file2c')
-REGRESSION_TEST(`2', `head -c 26 regress.in | file2c PREFIX')
-REGRESSION_TEST(`3', `head -c 39 regress.in | file2c PREFIX SUFFIX')
-REGRESSION_TEST(`4', `head -c 52 regress.in | file2c -x')
-REGRESSION_TEST(`5', `head -c 65 regress.in | file2c -n -1')
-
-REGRESSION_TEST(`6', `head -c  7 regress.in | file2c -n 1 P S')
-REGRESSION_TEST(`7', `head -c 14 regress.in | file2c -n 2 -x "P S"')
-REGRESSION_TEST(`8', `head -c 21 regress.in | file2c -n 16 P -x S')
-
-REGRESSION_TEST(`9', `file2c "const char data[] = {" ", 0};" < regress.in')
-
-REGRESSION_END()
diff --git a/tools/regression/usr.bin/file2c/regress.t b/tools/regression/usr.bin/file2c/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/file2c/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/join/Makefile b/tools/regression/usr.bin/join/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/join/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/join/regress.t b/tools/regression/usr.bin/join/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/join/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/jot/Makefile b/tools/regression/usr.bin/jot/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/jot/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/jot/regress.t b/tools/regression/usr.bin/jot/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/jot/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/lastcomm/Makefile b/tools/regression/usr.bin/lastcomm/Makefile
deleted file mode 100644
index 930f3ff..0000000
--- a/tools/regression/usr.bin/lastcomm/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-all: regress
-
-regress: regress.t
-	./regress.t
diff --git a/tools/regression/usr.bin/lastcomm/regress.t b/tools/regression/usr.bin/lastcomm/regress.t
deleted file mode 100755
index d733dbc..0000000
--- a/tools/regression/usr.bin/lastcomm/regress.t
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-DIR=`dirname $0`
-ARCH=`uname -m`
-
-TZ=UTC; export TZ
-
-check()
-{
-	NUM=$1
-	shift
-	# Remove tty field, which varies between systems.
-	awk '{$4 = ""; print}' |
-	if diff -q - $DIR/$1
-	then
-		echo "ok $NUM"
-	else
-		echo "not ok $NUM"
-	fi
-}
-
-
-cat $DIR/v1-$ARCH-acct.in $DIR/v2-$ARCH-acct.in >$DIR/v1v2-$ARCH-acct.in
-cat $DIR/v2-$ARCH.out $DIR/v1-$ARCH.out >$DIR/v1v2-$ARCH.out
-
-echo 1..6
-
-lastcomm -cesuS -f $DIR/v1-$ARCH-acct.in | check 1 v1-$ARCH.out
-lastcomm -cesuS -f - <$DIR/v1-$ARCH-acct.in | tail -r | check 2 v1-$ARCH.out
-lastcomm -cesuS -f $DIR/v2-$ARCH-acct.in | check 3 v2-$ARCH.out
-lastcomm -cesuS -f - <$DIR/v2-$ARCH-acct.in | tail -r | check 4 v2-$ARCH.out
-lastcomm -cesuS -f $DIR/v1v2-$ARCH-acct.in | check 5 v1v2-$ARCH.out
-lastcomm -cesuS -f - <$DIR/v1v2-$ARCH-acct.in | tail -r | check 6 v1v2-$ARCH.out
-
-rm $DIR/v1v2-$ARCH-acct.in
-rm $DIR/v1v2-$ARCH.out
-
-exit 0
diff --git a/tools/regression/usr.bin/m4/Makefile b/tools/regression/usr.bin/m4/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/m4/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/m4/regress.sh b/tools/regression/usr.bin/m4/regress.sh
deleted file mode 100644
index 6f22f7d..0000000
--- a/tools/regression/usr.bin/m4/regress.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-# $FreeBSD$
-
-LC_ALL=C; export LC_ALL
-
-echo 1..21
-
-REGRESSION_START($1)
-
-REGRESSION_TEST(`args', `m4 args.m4')
-REGRESSION_TEST(`args2', `m4 args2.m4')
-REGRESSION_TEST(`comments', `m4 comments.m4')
-REGRESSION_TEST(`esyscmd', `m4 esyscmd.m4')
-REGRESSION_TEST(`eval', `m4 eval.m4')
-REGRESSION_TEST(`ff_after_dnl', `uudecode -o /dev/stdout ff_after_dnl.m4.uu | m4')
-REGRESSION_TEST(`gnueval', `m4 -g gnueval.m4')
-REGRESSION_TEST(`gnuformat', `m4 -g gnuformat.m4')
-REGRESSION_TEST(`gnupatterns', `m4 -g gnupatterns.m4')
-REGRESSION_TEST(`gnupatterns2', `m4 -g gnupatterns2.m4')
-REGRESSION_TEST(`gnuprefix', `m4 -P gnuprefix.m4 2>&1')
-REGRESSION_TEST(`gnusofterror', `m4 -g gnusofterror.m4 2>&1')
-REGRESSION_TEST(`gnutranslit2', `m4 -g translit2.m4')
-REGRESSION_TEST(`includes', `m4 -I. includes.m4')
-REGRESSION_TEST(`m4wrap3', `m4 m4wrap3.m4')
-REGRESSION_TEST(`patterns', `m4 patterns.m4')
-REGRESSION_TEST(`quotes', `m4 quotes.m4 2>&1')
-REGRESSION_TEST(`strangequotes', `uudecode -o /dev/stdout strangequotes.m4.uu | m4')
-REGRESSION_TEST(`redef', `m4 redef.m4')
-REGRESSION_TEST(`translit', `m4 translit.m4')
-REGRESSION_TEST(`translit2', `m4 translit2.m4')
-
-REGRESSION_END()
diff --git a/tools/regression/usr.bin/m4/regress.t b/tools/regression/usr.bin/m4/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/m4/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/make/all.sh b/tools/regression/usr.bin/make/all.sh
deleted file mode 100755
index 42f9e73..0000000
--- a/tools/regression/usr.bin/make/all.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# find all test scripts below our current directory
-SCRIPTS=`find . -name test.t`
-
-if [ -z "${SCRIPTS}" ] ; then
-	exit 0
-fi
-
-for i in ${SCRIPTS} ; do
-	(
-	cd `dirname $i`
-	sh ./test.t $1
-	)
-done
diff --git a/tools/regression/usr.bin/ncal/Makefile b/tools/regression/usr.bin/ncal/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/ncal/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/ncal/regress.t b/tools/regression/usr.bin/ncal/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/ncal/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/printf/Makefile b/tools/regression/usr.bin/printf/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/printf/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/printf/regress.t b/tools/regression/usr.bin/printf/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/printf/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/sed/Makefile b/tools/regression/usr.bin/sed/Makefile
deleted file mode 100644
index 6b4caed..0000000
--- a/tools/regression/usr.bin/sed/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
-	@sh multitest.t
-	@sh inplace_race.t
diff --git a/tools/regression/usr.bin/sed/regress.t b/tools/regression/usr.bin/sed/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/sed/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/tr/Makefile b/tools/regression/usr.bin/tr/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/tr/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/tr/regress.sh b/tools/regression/usr.bin/tr/regress.sh
deleted file mode 100644
index badef15..0000000
--- a/tools/regression/usr.bin/tr/regress.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-echo 1..14
-
-REGRESSION_START($1)
-
-REGRESSION_TEST(`00', `tr abcde 12345 < regress.in')
-REGRESSION_TEST(`01', `tr 12345 abcde < regress.in')
-REGRESSION_TEST(`02', `tr -d aceg < regress.in')
-REGRESSION_TEST(`03', `tr "[[:lower:]]" "[[:upper:]]" < regress.in')
-REGRESSION_TEST(`04', `tr "[[:alpha:]]" . < regress.in')
-REGRESSION_TEST(`05', `tr "[[:lower:]]" "[[:upper:]]" < regress.in | tr "[[:upper:]]" "[[:lower:]]"')
-REGRESSION_TEST(`06', `tr "[[:digit:]]" "?" < regress2.in')
-REGRESSION_TEST(`07', `tr "[[:alnum:]]" "#" < regress2.in')
-REGRESSION_TEST(`08', `tr "[[:upper:]]" "[[:lower:]]" < regress2.in | tr -d "[^[:alpha:]] "')
-REGRESSION_TEST(`09', `printf "\\f\\r\\n" | tr "\\014\\r" "?#"')
-REGRESSION_TEST(`0a', `printf "0xdeadbeef\\n" | tr "x[[:xdigit:]]" "?\$"')
-REGRESSION_TEST(`0b', `(tr -cd "[[:xdigit:]]" < regress2.in ; echo)')
-REGRESSION_TEST(`0c', `echo "[[[[]]]]" | tr -d "[=]=]"')
-REGRESSION_TEST(`0d', `echo "]=[" | tr -d "[=]"')
-
-REGRESSION_END()
diff --git a/tools/regression/usr.bin/tr/regress.t b/tools/regression/usr.bin/tr/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/tr/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/uudecode/Makefile b/tools/regression/usr.bin/uudecode/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/uudecode/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/uudecode/regress.sh b/tools/regression/usr.bin/uudecode/regress.sh
deleted file mode 100644
index f131280..0000000
--- a/tools/regression/usr.bin/uudecode/regress.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-echo 1..2
-
-REGRESSION_START($1)
-
-REGRESSION_TEST_ONE(`uudecode -p < regress.traditional.in', `traditional')
-REGRESSION_TEST_ONE(`uudecode -p < regress.base64.in', `base64')
-
-REGRESSION_END()
diff --git a/tools/regression/usr.bin/uudecode/regress.t b/tools/regression/usr.bin/uudecode/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/uudecode/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/uuencode/Makefile b/tools/regression/usr.bin/uuencode/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/uuencode/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/uuencode/regress.sh b/tools/regression/usr.bin/uuencode/regress.sh
deleted file mode 100644
index e14b2c3..0000000
--- a/tools/regression/usr.bin/uuencode/regress.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-echo 1..2
-
-REGRESSION_START($1)
-
-# To make sure we end up with matching headers.
-umask 022
-
-REGRESSION_TEST(`traditional', `uuencode regress.in < regress.in')
-REGRESSION_TEST(`base64', `uuencode -m regress.in < regress.in')
-
-REGRESSION_END()
diff --git a/tools/regression/usr.bin/uuencode/regress.t b/tools/regression/usr.bin/uuencode/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/uuencode/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/xargs/Makefile b/tools/regression/usr.bin/xargs/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/xargs/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/xargs/regress.sh b/tools/regression/usr.bin/xargs/regress.sh
deleted file mode 100644
index 4edeae4..0000000
--- a/tools/regression/usr.bin/xargs/regress.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-
-echo 1..13
-
-REGRESSION_START($1)
-
-REGRESSION_TEST(`normal', `xargs echo The < regress.in')
-REGRESSION_TEST(`I', `xargs -I% echo The % % % %% % % < regress.in')
-REGRESSION_TEST(`J', `xargs -J% echo The % again. < regress.in')
-REGRESSION_TEST(`L', `xargs -L3 echo < regress.in')
-REGRESSION_TEST(`R', `xargs -I% -R1 echo The % % % %% % % < regress.in')
-REGRESSION_TEST(`n1', `xargs -n1 echo < regress.in')
-REGRESSION_TEST(`n2', `xargs -n2 echo < regress.in')
-REGRESSION_TEST(`n3', `xargs -n3 echo < regress.in')
-REGRESSION_TEST(`0', `xargs -0 -n1 echo < regress.0.in')
-REGRESSION_TEST(`0I', `xargs -0 -I% echo The % %% % < regress.0.in')
-REGRESSION_TEST(`0J', `xargs -0 -J% echo The % again. < regress.0.in')
-REGRESSION_TEST(`0L', `xargs -0 -L2 echo < regress.0.in')
-REGRESSION_TEST(`quotes', `xargs -n1 echo < regress.quotes.in')
-
-REGRESSION_END()
diff --git a/tools/regression/usr.bin/xargs/regress.t b/tools/regression/usr.bin/xargs/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/xargs/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.bin/yacc/Makefile b/tools/regression/usr.bin/yacc/Makefile
deleted file mode 100644
index b937d41..0000000
--- a/tools/regression/usr.bin/yacc/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/yacc/regress.sh b/tools/regression/usr.bin/yacc/regress.sh
deleted file mode 100755
index 5b004be..0000000
--- a/tools/regression/usr.bin/yacc/regress.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-LC_ALL=C; export LC_ALL
-
-echo 1..15
-
-REGRESSION_START($1)
-
-REGRESSION_TEST(`00', `yacc -b regress -o /dev/stdout undefined.y')
-REGRESSION_TEST(`01', `yacc -b regress -o /dev/stdout calc.y')
-REGRESSION_TEST(`02', `yacc -b regress -o /dev/stdout calc1.y')
-REGRESSION_TEST(`03', `yacc -b regress -o /dev/stdout calc3.y')
-REGRESSION_TEST(`04', `yacc -b regress -o /dev/stdout code_calc.y')
-REGRESSION_TEST(`05', `yacc -b regress -o /dev/stdout code_error.y')
-REGRESSION_TEST(`06', `yacc -b regress -o /dev/stdout error.y')
-REGRESSION_TEST(`07', `yacc -b regress -o /dev/stdout ftp.y')
-REGRESSION_TEST(`08', `yacc -b regress -o /dev/stdout grammar.y')
-REGRESSION_TEST(`09', `yacc -b regress -o /dev/stdout pure_calc.y')
-REGRESSION_TEST(`10', `yacc -b regress -o /dev/stdout pure_error.y')
-REGRESSION_TEST(`11', `yacc -b regress -o /dev/stdout quote_calc.y')
-REGRESSION_TEST(`12', `yacc -b regress -o /dev/stdout quote_calc2.y')
-REGRESSION_TEST(`13', `yacc -b regress -o /dev/stdout quote_calc3.y')
-REGRESSION_TEST(`14', `yacc -b regress -o /dev/stdout quote_calc4.y')
-
-REGRESSION_END()
-
diff --git a/tools/regression/usr.bin/yacc/regress.t b/tools/regression/usr.bin/yacc/regress.t
deleted file mode 100644
index a82aacd..0000000
--- a/tools/regression/usr.bin/yacc/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-m4 ../regress.m4 regress.sh | sh
diff --git a/tools/regression/usr.sbin/Makefile b/tools/regression/usr.sbin/Makefile
deleted file mode 100644
index 071100b..0000000
--- a/tools/regression/usr.sbin/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	newsyslog sa
-
-.include <bsd.subdir.mk>
diff --git a/tools/regression/usr.sbin/newsyslog/Makefile b/tools/regression/usr.sbin/newsyslog/Makefile
deleted file mode 100644
index 2c9ca59..0000000
--- a/tools/regression/usr.sbin/newsyslog/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	sh regress.sh
diff --git a/tools/regression/usr.sbin/newsyslog/regress.t b/tools/regression/usr.sbin/newsyslog/regress.t
deleted file mode 100755
index c36d834..0000000
--- a/tools/regression/usr.sbin/newsyslog/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-sh regress.sh
diff --git a/tools/regression/usr.sbin/sa/Makefile b/tools/regression/usr.sbin/sa/Makefile
deleted file mode 100644
index 930f3ff..0000000
--- a/tools/regression/usr.sbin/sa/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-all: regress
-
-regress: regress.t
-	./regress.t
diff --git a/tools/regression/usr.sbin/sa/regress.t b/tools/regression/usr.sbin/sa/regress.t
deleted file mode 100755
index d28536a..0000000
--- a/tools/regression/usr.sbin/sa/regress.t
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-DIR=`dirname $0`
-LCDIR=`dirname $0`/../../usr.bin/lastcomm
-ARCH=`uname -m`
-
-collapse_whitespace()
-{
-	sed -E 's,[ 	]+, ,g'
-}
-
-check()
-{
-	NUM=$1
-	shift
-	collapse_whitespace | \
-	if diff -q - $1
-	then
-		echo "ok $NUM"
-	else
-		echo "not ok $NUM"
-	fi
-}
-
-cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
-cp $LCDIR/v2-$ARCH-acct.in $DIR/v2-$ARCH-acct.in
-
-echo 1..13
-
-# Command listings of the two acct versions
-sa -u $DIR/v1-$ARCH-acct.in | check 1 $DIR/v1-$ARCH-u.out
-sa -u $DIR/v2-$ARCH-acct.in | check 2 $DIR/v2-$ARCH-u.out
-
-# Plain summaries of user/process
-sa -i $DIR/v1-$ARCH-acct.in | check 3 $DIR/v1-$ARCH-sav.out
-sa -im $DIR/v1-$ARCH-acct.in | check 4 $DIR/v1-$ARCH-usr.out
-
-# Backward compatibility of v1 summary files
-sa -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null |
-	check 5 $DIR/v1-$ARCH-sav.out
-sa -m -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null |
-	check 6 $DIR/v1-$ARCH-usr.out
-
-# Convert old summary format to new 
-cp $DIR/v1-$ARCH-sav.in $DIR/v2c-$ARCH-sav.in
-cp $DIR/v1-$ARCH-usr.in $DIR/v2c-$ARCH-usr.in
-sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null >/dev/null
-sa -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null |
-	check 7 $DIR/v1-$ARCH-sav.out
-sa -m -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null |
-	check 8 $DIR/v1-$ARCH-usr.out
-
-# Reading v2 summary files
-sa -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null |
-	check 9 $DIR/v1-$ARCH-sav.out
-sa -m -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null |
-	check 10 $DIR/v1-$ARCH-usr.out
-
-# Summarize
-sa -is -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in >/dev/null
-sa -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null |
-	check 11 $DIR/v1-$ARCH-sav.out
-sa -m -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null |
-	check 12 $DIR/v1-$ARCH-usr.out
-
-# Accumulate
-cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
-sa -is -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in >/dev/null
-cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
-sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in \
-    | collapse_whitespace >$DIR/double
-cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
-sa -i $DIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in | check 13 $DIR/double
-
-# Clean up
-rm $DIR/double $DIR/v2c-$ARCH-usr.in $DIR/v2c-$ARCH-sav.in $DIR/v1-$ARCH-acct.in $DIR/v2-$ARCH-acct.in
-
-exit 0
diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile
index c23d928..bf37b9c 100644
--- a/usr.bin/apply/Makefile
+++ b/usr.bin/apply/Makefile
@@ -1,8 +1,14 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	apply
 DPADD=	${LIBSBUF}
 LDADD=	-lsbuf
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/apply/tests/Makefile b/usr.bin/apply/tests/Makefile
new file mode 100644
index 0000000..332bf7d
--- /dev/null
+++ b/usr.bin/apply/tests/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/apply
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.00.in
+FILES+=		regress.00.out
+FILES+=		regress.01.out
+FILES+=		regress.01.sh
+FILES+=		regress.sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/apply/tests/legacy_test.sh b/usr.bin/apply/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/apply/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/apply/regress.00.in b/usr.bin/apply/tests/regress.00.in
index 8282be7..8282be7 100644
--- a/tools/regression/usr.bin/apply/regress.00.in
+++ b/usr.bin/apply/tests/regress.00.in
diff --git a/tools/regression/usr.bin/apply/regress.00.out b/usr.bin/apply/tests/regress.00.out
index c725cb2..c725cb2 100644
--- a/tools/regression/usr.bin/apply/regress.00.out
+++ b/usr.bin/apply/tests/regress.00.out
diff --git a/tools/regression/usr.bin/apply/regress.01.out b/usr.bin/apply/tests/regress.01.out
index bcf5ab2..bcf5ab2 100644
--- a/tools/regression/usr.bin/apply/regress.01.out
+++ b/usr.bin/apply/tests/regress.01.out
diff --git a/tools/regression/usr.bin/apply/regress.01.sh b/usr.bin/apply/tests/regress.01.sh
index db5f1d4..db5f1d4 100644
--- a/tools/regression/usr.bin/apply/regress.01.sh
+++ b/usr.bin/apply/tests/regress.01.sh
diff --git a/usr.bin/apply/tests/regress.sh b/usr.bin/apply/tests/regress.sh
new file mode 100644
index 0000000..0a20d50
--- /dev/null
+++ b/usr.bin/apply/tests/regress.sh
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+echo 1..2
+
+REGRESSION_START($1)
+
+REGRESSION_TEST(`00', `apply "echo %1 %1 %1 %1" $(cat ${SRCDIR}/regress.00.in)')
+REGRESSION_TEST(`01', `sh ${SRCDIR}/regress.01.sh')
+
+REGRESSION_END()
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 66403fe..b347a52 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	calendar
 SRCS=	calendar.c locale.c events.c dates.c parsedata.c io.c day.c \
 	ostern.c paskha.c pom.c sunpos.c calcpp.c
@@ -31,4 +33,8 @@ beforeinstall:
 	ln -s fr_FR.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link}
 .endfor
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/calendar/tests/Makefile b/usr.bin/calendar/tests/Makefile
new file mode 100644
index 0000000..f3d592e
--- /dev/null
+++ b/usr.bin/calendar/tests/Makefile
@@ -0,0 +1,39 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/calendar
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		calendar.calibrate
+FILES+=		regress.a1.out
+FILES+=		regress.a2.out
+FILES+=		regress.a3.out
+FILES+=		regress.a4.out
+FILES+=		regress.a5.out
+FILES+=		regress.b1.out
+FILES+=		regress.b2.out
+FILES+=		regress.b3.out
+FILES+=		regress.b4.out
+FILES+=		regress.b5.out
+FILES+=		regress.s1.out
+FILES+=		regress.s2.out
+FILES+=		regress.s3.out
+FILES+=		regress.s4.out
+FILES+=		regress.sh
+FILES+=		regress.w0-1.out
+FILES+=		regress.w0-2.out
+FILES+=		regress.w0-3.out
+FILES+=		regress.w0-4.out
+FILES+=		regress.w0-5.out
+FILES+=		regress.w0-6.out
+FILES+=		regress.w0-7.out
+FILES+=		regress.wn-1.out
+FILES+=		regress.wn-2.out
+FILES+=		regress.wn-3.out
+FILES+=		regress.wn-4.out
+FILES+=		regress.wn-5.out
+FILES+=		regress.wn-6.out
+FILES+=		regress.wn-7.out
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/calendar/calendar.calibrate b/usr.bin/calendar/tests/calendar.calibrate
index 28e7e4a..28e7e4a 100644
--- a/tools/regression/usr.bin/calendar/calendar.calibrate
+++ b/usr.bin/calendar/tests/calendar.calibrate
diff --git a/usr.bin/calendar/tests/legacy_test.sh b/usr.bin/calendar/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/calendar/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/calendar/regress.a1.out b/usr.bin/calendar/tests/regress.a1.out
index ef3d71d..ef3d71d 100644
--- a/tools/regression/usr.bin/calendar/regress.a1.out
+++ b/usr.bin/calendar/tests/regress.a1.out
diff --git a/tools/regression/usr.bin/calendar/regress.a2.out b/usr.bin/calendar/tests/regress.a2.out
index 0fed38b..0fed38b 100644
--- a/tools/regression/usr.bin/calendar/regress.a2.out
+++ b/usr.bin/calendar/tests/regress.a2.out
diff --git a/tools/regression/usr.bin/calendar/regress.a3.out b/usr.bin/calendar/tests/regress.a3.out
index 9dabd33..9dabd33 100644
--- a/tools/regression/usr.bin/calendar/regress.a3.out
+++ b/usr.bin/calendar/tests/regress.a3.out
diff --git a/tools/regression/usr.bin/calendar/regress.a4.out b/usr.bin/calendar/tests/regress.a4.out
index e3756b1..e3756b1 100644
--- a/tools/regression/usr.bin/calendar/regress.a4.out
+++ b/usr.bin/calendar/tests/regress.a4.out
diff --git a/tools/regression/usr.bin/calendar/regress.a5.out b/usr.bin/calendar/tests/regress.a5.out
index 4f61d48..4f61d48 100644
--- a/tools/regression/usr.bin/calendar/regress.a5.out
+++ b/usr.bin/calendar/tests/regress.a5.out
diff --git a/tools/regression/usr.bin/calendar/regress.b1.out b/usr.bin/calendar/tests/regress.b1.out
index ef3d71d..ef3d71d 100644
--- a/tools/regression/usr.bin/calendar/regress.b1.out
+++ b/usr.bin/calendar/tests/regress.b1.out
diff --git a/tools/regression/usr.bin/calendar/regress.b2.out b/usr.bin/calendar/tests/regress.b2.out
index 0fed38b..0fed38b 100644
--- a/tools/regression/usr.bin/calendar/regress.b2.out
+++ b/usr.bin/calendar/tests/regress.b2.out
diff --git a/tools/regression/usr.bin/calendar/regress.b3.out b/usr.bin/calendar/tests/regress.b3.out
index 9dabd33..9dabd33 100644
--- a/tools/regression/usr.bin/calendar/regress.b3.out
+++ b/usr.bin/calendar/tests/regress.b3.out
diff --git a/tools/regression/usr.bin/calendar/regress.b4.out b/usr.bin/calendar/tests/regress.b4.out
index e3756b1..e3756b1 100644
--- a/tools/regression/usr.bin/calendar/regress.b4.out
+++ b/usr.bin/calendar/tests/regress.b4.out
diff --git a/tools/regression/usr.bin/calendar/regress.b5.out b/usr.bin/calendar/tests/regress.b5.out
index 4f61d48..4f61d48 100644
--- a/tools/regression/usr.bin/calendar/regress.b5.out
+++ b/usr.bin/calendar/tests/regress.b5.out
diff --git a/tools/regression/usr.bin/calendar/regress.s1.out b/usr.bin/calendar/tests/regress.s1.out
index 0fed38b..0fed38b 100644
--- a/tools/regression/usr.bin/calendar/regress.s1.out
+++ b/usr.bin/calendar/tests/regress.s1.out
diff --git a/tools/regression/usr.bin/calendar/regress.s2.out b/usr.bin/calendar/tests/regress.s2.out
index 65ab9c9..65ab9c9 100644
--- a/tools/regression/usr.bin/calendar/regress.s2.out
+++ b/usr.bin/calendar/tests/regress.s2.out
diff --git a/tools/regression/usr.bin/calendar/regress.s3.out b/usr.bin/calendar/tests/regress.s3.out
index 0c61207..0c61207 100644
--- a/tools/regression/usr.bin/calendar/regress.s3.out
+++ b/usr.bin/calendar/tests/regress.s3.out
diff --git a/tools/regression/usr.bin/calendar/regress.s4.out b/usr.bin/calendar/tests/regress.s4.out
index 8489769..8489769 100644
--- a/tools/regression/usr.bin/calendar/regress.s4.out
+++ b/usr.bin/calendar/tests/regress.s4.out
diff --git a/tools/regression/usr.bin/calendar/regress.sh b/usr.bin/calendar/tests/regress.sh
index 70447ca..248123a 100644
--- a/tools/regression/usr.bin/calendar/regress.sh
+++ b/usr.bin/calendar/tests/regress.sh
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-CALENDAR_FILE="-f calendar.calibrate"
+CALENDAR_FILE="-f ${SRCDIR}/calendar.calibrate"
 CALENDAR_BIN="calendar"
 
 CALENDAR="${CALENDAR_BIN} ${CALENDAR_FILE}"
diff --git a/tools/regression/usr.bin/calendar/regress.w0-1.out b/usr.bin/calendar/tests/regress.w0-1.out
index 5bd4072..5bd4072 100644
--- a/tools/regression/usr.bin/calendar/regress.w0-1.out
+++ b/usr.bin/calendar/tests/regress.w0-1.out
diff --git a/tools/regression/usr.bin/calendar/regress.w0-2.out b/usr.bin/calendar/tests/regress.w0-2.out
index 66e7063..66e7063 100644
--- a/tools/regression/usr.bin/calendar/regress.w0-2.out
+++ b/usr.bin/calendar/tests/regress.w0-2.out
diff --git a/tools/regression/usr.bin/calendar/regress.w0-3.out b/usr.bin/calendar/tests/regress.w0-3.out
index 03073ee..03073ee 100644
--- a/tools/regression/usr.bin/calendar/regress.w0-3.out
+++ b/usr.bin/calendar/tests/regress.w0-3.out
diff --git a/tools/regression/usr.bin/calendar/regress.w0-4.out b/usr.bin/calendar/tests/regress.w0-4.out
index a14f6b6..a14f6b6 100644
--- a/tools/regression/usr.bin/calendar/regress.w0-4.out
+++ b/usr.bin/calendar/tests/regress.w0-4.out
diff --git a/tools/regression/usr.bin/calendar/regress.w0-5.out b/usr.bin/calendar/tests/regress.w0-5.out
index 1232b9b..1232b9b 100644
--- a/tools/regression/usr.bin/calendar/regress.w0-5.out
+++ b/usr.bin/calendar/tests/regress.w0-5.out
diff --git a/tools/regression/usr.bin/calendar/regress.w0-6.out b/usr.bin/calendar/tests/regress.w0-6.out
index b3545a2..b3545a2 100644
--- a/tools/regression/usr.bin/calendar/regress.w0-6.out
+++ b/usr.bin/calendar/tests/regress.w0-6.out
diff --git a/tools/regression/usr.bin/calendar/regress.w0-7.out b/usr.bin/calendar/tests/regress.w0-7.out
index 6449760..6449760 100644
--- a/tools/regression/usr.bin/calendar/regress.w0-7.out
+++ b/usr.bin/calendar/tests/regress.w0-7.out
diff --git a/tools/regression/usr.bin/calendar/regress.wn-1.out b/usr.bin/calendar/tests/regress.wn-1.out
index 5bd4072..5bd4072 100644
--- a/tools/regression/usr.bin/calendar/regress.wn-1.out
+++ b/usr.bin/calendar/tests/regress.wn-1.out
diff --git a/tools/regression/usr.bin/calendar/regress.wn-2.out b/usr.bin/calendar/tests/regress.wn-2.out
index 84a2b33..84a2b33 100644
--- a/tools/regression/usr.bin/calendar/regress.wn-2.out
+++ b/usr.bin/calendar/tests/regress.wn-2.out
diff --git a/tools/regression/usr.bin/calendar/regress.wn-3.out b/usr.bin/calendar/tests/regress.wn-3.out
index 7f027e5..7f027e5 100644
--- a/tools/regression/usr.bin/calendar/regress.wn-3.out
+++ b/usr.bin/calendar/tests/regress.wn-3.out
diff --git a/tools/regression/usr.bin/calendar/regress.wn-4.out b/usr.bin/calendar/tests/regress.wn-4.out
index ef3d71d..ef3d71d 100644
--- a/tools/regression/usr.bin/calendar/regress.wn-4.out
+++ b/usr.bin/calendar/tests/regress.wn-4.out
diff --git a/tools/regression/usr.bin/calendar/regress.wn-5.out b/usr.bin/calendar/tests/regress.wn-5.out
index c38c00b..c38c00b 100644
--- a/tools/regression/usr.bin/calendar/regress.wn-5.out
+++ b/usr.bin/calendar/tests/regress.wn-5.out
diff --git a/tools/regression/usr.bin/calendar/regress.wn-6.out b/usr.bin/calendar/tests/regress.wn-6.out
index 63c99fe..63c99fe 100644
--- a/tools/regression/usr.bin/calendar/regress.wn-6.out
+++ b/usr.bin/calendar/tests/regress.wn-6.out
diff --git a/tools/regression/usr.bin/calendar/regress.wn-7.out b/usr.bin/calendar/tests/regress.wn-7.out
index 4b48f68..4b48f68 100644
--- a/tools/regression/usr.bin/calendar/regress.wn-7.out
+++ b/usr.bin/calendar/tests/regress.wn-7.out
diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile
index 13da76f..59c9751 100644
--- a/usr.bin/comm/Makefile
+++ b/usr.bin/comm/Makefile
@@ -1,6 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	comm
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/comm/tests/Makefile b/usr.bin/comm/tests/Makefile
new file mode 100644
index 0000000..172943d
--- /dev/null
+++ b/usr.bin/comm/tests/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/comm
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.00.out
+FILES+=		regress.00a.in
+FILES+=		regress.00b.in
+FILES+=		regress.01.out
+FILES+=		regress.01a.in
+FILES+=		regress.01b.in
+FILES+=		regress.02.out
+FILES+=		regress.02a.in
+FILES+=		regress.02b.in
+FILES+=		regress.sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/comm/tests/legacy_test.sh b/usr.bin/comm/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/comm/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/comm/regress.00.out b/usr.bin/comm/tests/regress.00.out
index 89a65da..89a65da 100644
--- a/tools/regression/usr.bin/comm/regress.00.out
+++ b/usr.bin/comm/tests/regress.00.out
diff --git a/tools/regression/usr.bin/comm/regress.00a.in b/usr.bin/comm/tests/regress.00a.in
index 85b5cd5..85b5cd5 100644
--- a/tools/regression/usr.bin/comm/regress.00a.in
+++ b/usr.bin/comm/tests/regress.00a.in
diff --git a/tools/regression/usr.bin/comm/regress.00b.in b/usr.bin/comm/tests/regress.00b.in
index 89a65da..89a65da 100644
--- a/tools/regression/usr.bin/comm/regress.00b.in
+++ b/usr.bin/comm/tests/regress.00b.in
diff --git a/tools/regression/usr.bin/comm/regress.01.out b/usr.bin/comm/tests/regress.01.out
index 05ab154..05ab154 100644
--- a/tools/regression/usr.bin/comm/regress.01.out
+++ b/usr.bin/comm/tests/regress.01.out
diff --git a/tools/regression/usr.bin/comm/regress.01a.in b/usr.bin/comm/tests/regress.01a.in
index 78c410b..78c410b 100644
--- a/tools/regression/usr.bin/comm/regress.01a.in
+++ b/usr.bin/comm/tests/regress.01a.in
diff --git a/tools/regression/usr.bin/comm/regress.01b.in b/usr.bin/comm/tests/regress.01b.in
index 05ab154..05ab154 100644
--- a/tools/regression/usr.bin/comm/regress.01b.in
+++ b/usr.bin/comm/tests/regress.01b.in
diff --git a/tools/regression/usr.bin/comm/regress.02.out b/usr.bin/comm/tests/regress.02.out
index a451adb..a451adb 100644
--- a/tools/regression/usr.bin/comm/regress.02.out
+++ b/usr.bin/comm/tests/regress.02.out
diff --git a/tools/regression/usr.bin/comm/regress.02a.in b/usr.bin/comm/tests/regress.02a.in
index 1c943a9..1c943a9 100644
--- a/tools/regression/usr.bin/comm/regress.02a.in
+++ b/usr.bin/comm/tests/regress.02a.in
diff --git a/tools/regression/usr.bin/comm/regress.02b.in b/usr.bin/comm/tests/regress.02b.in
index 36019ee..36019ee 100644
--- a/tools/regression/usr.bin/comm/regress.02b.in
+++ b/usr.bin/comm/tests/regress.02b.in
diff --git a/usr.bin/comm/tests/regress.sh b/usr.bin/comm/tests/regress.sh
new file mode 100644
index 0000000..dcd0348
--- /dev/null
+++ b/usr.bin/comm/tests/regress.sh
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+echo 1..3
+
+REGRESSION_START($1)
+
+REGRESSION_TEST(`00', `comm -12 ${SRCDIR}/regress.00a.in ${SRCDIR}/regress.00b.in')
+REGRESSION_TEST(`01', `comm -12 ${SRCDIR}/regress.01a.in ${SRCDIR}/regress.01b.in')
+REGRESSION_TEST(`02', `comm ${SRCDIR}/regress.02a.in ${SRCDIR}/regress.02b.in')
+
+REGRESSION_END()
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index 82b7e97..4a80e58 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,11 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	file2c
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/file2c/tests/Makefile b/usr.bin/file2c/tests/Makefile
new file mode 100644
index 0000000..8854eb4
--- /dev/null
+++ b/usr.bin/file2c/tests/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/file2c
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.1.out
+FILES+=		regress.2.out
+FILES+=		regress.3.out
+FILES+=		regress.4.out
+FILES+=		regress.5.out
+FILES+=		regress.6.out
+FILES+=		regress.7.out
+FILES+=		regress.8.out
+FILES+=		regress.9.out
+FILES+=		regress.in
+FILES+=		regress.sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/file2c/tests/legacy_test.sh b/usr.bin/file2c/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/file2c/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/file2c/regress.1.out b/usr.bin/file2c/tests/regress.1.out
index 6b760fe..6b760fe 100644
--- a/tools/regression/usr.bin/file2c/regress.1.out
+++ b/usr.bin/file2c/tests/regress.1.out
diff --git a/tools/regression/usr.bin/file2c/regress.2.out b/usr.bin/file2c/tests/regress.2.out
index 07acb21..07acb21 100644
--- a/tools/regression/usr.bin/file2c/regress.2.out
+++ b/usr.bin/file2c/tests/regress.2.out
diff --git a/tools/regression/usr.bin/file2c/regress.3.out b/usr.bin/file2c/tests/regress.3.out
index 55502df..55502df 100644
--- a/tools/regression/usr.bin/file2c/regress.3.out
+++ b/usr.bin/file2c/tests/regress.3.out
diff --git a/tools/regression/usr.bin/file2c/regress.4.out b/usr.bin/file2c/tests/regress.4.out
index dc21fd0..dc21fd0 100644
--- a/tools/regression/usr.bin/file2c/regress.4.out
+++ b/usr.bin/file2c/tests/regress.4.out
diff --git a/tools/regression/usr.bin/file2c/regress.5.out b/usr.bin/file2c/tests/regress.5.out
index 8210ab5..8210ab5 100644
--- a/tools/regression/usr.bin/file2c/regress.5.out
+++ b/usr.bin/file2c/tests/regress.5.out
diff --git a/tools/regression/usr.bin/file2c/regress.6.out b/usr.bin/file2c/tests/regress.6.out
index 0f2bb74..0f2bb74 100644
--- a/tools/regression/usr.bin/file2c/regress.6.out
+++ b/usr.bin/file2c/tests/regress.6.out
diff --git a/tools/regression/usr.bin/file2c/regress.7.out b/usr.bin/file2c/tests/regress.7.out
index f94ac55..f94ac55 100644
--- a/tools/regression/usr.bin/file2c/regress.7.out
+++ b/usr.bin/file2c/tests/regress.7.out
diff --git a/tools/regression/usr.bin/file2c/regress.8.out b/usr.bin/file2c/tests/regress.8.out
index 5f5ce9d..5f5ce9d 100644
--- a/tools/regression/usr.bin/file2c/regress.8.out
+++ b/usr.bin/file2c/tests/regress.8.out
diff --git a/tools/regression/usr.bin/file2c/regress.9.out b/usr.bin/file2c/tests/regress.9.out
index 91f5e00..91f5e00 100644
--- a/tools/regression/usr.bin/file2c/regress.9.out
+++ b/usr.bin/file2c/tests/regress.9.out
diff --git a/tools/regression/usr.bin/file2c/regress.in b/usr.bin/file2c/tests/regress.in
index 405465a..405465a 100644
--- a/tools/regression/usr.bin/file2c/regress.in
+++ b/usr.bin/file2c/tests/regress.in
diff --git a/usr.bin/file2c/tests/regress.sh b/usr.bin/file2c/tests/regress.sh
new file mode 100644
index 0000000..c8146e7
--- /dev/null
+++ b/usr.bin/file2c/tests/regress.sh
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+echo 1..9
+
+REGRESSION_START($1)
+
+REGRESSION_TEST(`1', `head -c 13 ${SRCDIR}/regress.in | file2c')
+REGRESSION_TEST(`2', `head -c 26 ${SRCDIR}/regress.in | file2c PREFIX')
+REGRESSION_TEST(`3', `head -c 39 ${SRCDIR}/regress.in | file2c PREFIX SUFFIX')
+REGRESSION_TEST(`4', `head -c 52 ${SRCDIR}/regress.in | file2c -x')
+REGRESSION_TEST(`5', `head -c 65 ${SRCDIR}/regress.in | file2c -n -1')
+
+REGRESSION_TEST(`6', `head -c  7 ${SRCDIR}/regress.in | file2c -n 1 P S')
+REGRESSION_TEST(`7', `head -c 14 ${SRCDIR}/regress.in | file2c -n 2 -x "P S"')
+REGRESSION_TEST(`8', `head -c 21 ${SRCDIR}/regress.in | file2c -n 16 P -x S')
+
+REGRESSION_TEST(`9', `file2c "const char data[] = {" ", 0};" <${SRCDIR}/regress.in')
+
+REGRESSION_END()
diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile
index 3fa8629..61634ee 100644
--- a/usr.bin/join/Makefile
+++ b/usr.bin/join/Makefile
@@ -1,5 +1,12 @@
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 PROG=	join
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/join/tests/Makefile b/usr.bin/join/tests/Makefile
new file mode 100644
index 0000000..2d5580f
--- /dev/null
+++ b/usr.bin/join/tests/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/join
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.1.in
+FILES+=		regress.2.in
+FILES+=		regress.out
+FILES+=		regress.sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/join/tests/legacy_test.sh b/usr.bin/join/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/join/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/join/regress.1.in b/usr.bin/join/tests/regress.1.in
index 975bbaf..975bbaf 100644
--- a/tools/regression/usr.bin/join/regress.1.in
+++ b/usr.bin/join/tests/regress.1.in
diff --git a/tools/regression/usr.bin/join/regress.2.in b/usr.bin/join/tests/regress.2.in
index 0206b49..0206b49 100644
--- a/tools/regression/usr.bin/join/regress.2.in
+++ b/usr.bin/join/tests/regress.2.in
diff --git a/tools/regression/usr.bin/join/regress.out b/usr.bin/join/tests/regress.out
index fa75c88..fa75c88 100644
--- a/tools/regression/usr.bin/join/regress.out
+++ b/usr.bin/join/tests/regress.out
diff --git a/tools/regression/usr.bin/join/regress.sh b/usr.bin/join/tests/regress.sh
index 5807c14..e07e554 100644
--- a/tools/regression/usr.bin/join/regress.sh
+++ b/usr.bin/join/tests/regress.sh
@@ -4,6 +4,6 @@ echo 1..1
 
 REGRESSION_START($1)
 
-REGRESSION_TEST_ONE(`join -t , -a1 -a2 -e "(unknown)" -o 0,1.2,2.2 regress.1.in regress.2.in')
+REGRESSION_TEST_ONE(`join -t , -a1 -a2 -e "(unknown)" -o 0,1.2,2.2 ${SRCDIR}/regress.1.in ${SRCDIR}/regress.2.in')
 
 REGRESSION_END()
diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile
index 662600e..ca64649 100644
--- a/usr.bin/jot/Makefile
+++ b/usr.bin/jot/Makefile
@@ -1,6 +1,12 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	jot
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/jot/tests/Makefile b/usr.bin/jot/tests/Makefile
new file mode 100644
index 0000000..ef20eb2
--- /dev/null
+++ b/usr.bin/jot/tests/Makefile
@@ -0,0 +1,71 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/jot
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.ascii.out
+FILES+=		regress.block.out
+FILES+=		regress.dddd.out
+FILES+=		regress.dddh.out
+FILES+=		regress.ddhd.out
+FILES+=		regress.ddhd2.out
+FILES+=		regress.ddhh.out
+FILES+=		regress.ddhh2.out
+FILES+=		regress.dhdd.out
+FILES+=		regress.dhdh.out
+FILES+=		regress.dhhd.out
+FILES+=		regress.dhhd2.out
+FILES+=		regress.dhhh.out
+FILES+=		regress.dhhh2.out
+FILES+=		regress.ed.out
+FILES+=		regress.grep.out
+FILES+=		regress.hddd.out
+FILES+=		regress.hddd2.out
+FILES+=		regress.hddh.out
+FILES+=		regress.hddh2.out
+FILES+=		regress.hdhd.out
+FILES+=		regress.hdhd2.out
+FILES+=		regress.hdhh.out
+FILES+=		regress.hdhh2.out
+FILES+=		regress.hhdd.out
+FILES+=		regress.hhdd2.out
+FILES+=		regress.hhdh.out
+FILES+=		regress.hhdh2.out
+FILES+=		regress.hhhd.out
+FILES+=		regress.hhhd2.out
+FILES+=		regress.hhhh.out
+FILES+=		regress.hhhh2.out
+FILES+=		regress.n21.out
+FILES+=		regress.rand1.out
+FILES+=		regress.rand2.out
+FILES+=		regress.sh
+FILES+=		regress.stutter.out
+FILES+=		regress.stutter2.out
+FILES+=		regress.tabs.out
+FILES+=		regress.wX1.out
+FILES+=		regress.wXl.out
+FILES+=		regress.wc.out
+FILES+=		regress.wdl.out
+FILES+=		regress.wdn.out
+FILES+=		regress.we.out
+FILES+=		regress.wf.out
+FILES+=		regress.wg.out
+FILES+=		regress.wgd.out
+FILES+=		regress.wo.out
+FILES+=		regress.wp1.out
+FILES+=		regress.wp2.out
+FILES+=		regress.wp3.out
+FILES+=		regress.wp4.out
+FILES+=		regress.wp5.out
+FILES+=		regress.wp6.out
+FILES+=		regress.wu.out
+FILES+=		regress.wwe.out
+FILES+=		regress.wx.out
+FILES+=		regress.wxn.out
+FILES+=		regress.x.out
+FILES+=		regress.xaa.out
+FILES+=		regress.yes.out
+
+.include <bsd.test.mk>
diff --git a/usr.bin/jot/tests/legacy_test.sh b/usr.bin/jot/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/jot/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/jot/regress.ascii.out b/usr.bin/jot/tests/regress.ascii.out
index abcfb84..abcfb84 100644
--- a/tools/regression/usr.bin/jot/regress.ascii.out
+++ b/usr.bin/jot/tests/regress.ascii.out
diff --git a/tools/regression/usr.bin/jot/regress.block.out b/usr.bin/jot/tests/regress.block.out
index a6f4536..a6f4536 100644
--- a/tools/regression/usr.bin/jot/regress.block.out
+++ b/usr.bin/jot/tests/regress.block.out
diff --git a/tools/regression/usr.bin/jot/regress.dddd.out b/usr.bin/jot/tests/regress.dddd.out
index 190423f..190423f 100644
--- a/tools/regression/usr.bin/jot/regress.dddd.out
+++ b/usr.bin/jot/tests/regress.dddd.out
diff --git a/tools/regression/usr.bin/jot/regress.dddh.out b/usr.bin/jot/tests/regress.dddh.out
index d0da901..d0da901 100644
--- a/tools/regression/usr.bin/jot/regress.dddh.out
+++ b/usr.bin/jot/tests/regress.dddh.out
diff --git a/tools/regression/usr.bin/jot/regress.ddhd.out b/usr.bin/jot/tests/regress.ddhd.out
index 544a1ea..544a1ea 100644
--- a/tools/regression/usr.bin/jot/regress.ddhd.out
+++ b/usr.bin/jot/tests/regress.ddhd.out
diff --git a/tools/regression/usr.bin/jot/regress.ddhd2.out b/usr.bin/jot/tests/regress.ddhd2.out
index 6e21bc7..6e21bc7 100644
--- a/tools/regression/usr.bin/jot/regress.ddhd2.out
+++ b/usr.bin/jot/tests/regress.ddhd2.out
diff --git a/tools/regression/usr.bin/jot/regress.ddhh.out b/usr.bin/jot/tests/regress.ddhh.out
index 46066d0..46066d0 100644
--- a/tools/regression/usr.bin/jot/regress.ddhh.out
+++ b/usr.bin/jot/tests/regress.ddhh.out
diff --git a/tools/regression/usr.bin/jot/regress.ddhh2.out b/usr.bin/jot/tests/regress.ddhh2.out
index 9299c4c..9299c4c 100644
--- a/tools/regression/usr.bin/jot/regress.ddhh2.out
+++ b/usr.bin/jot/tests/regress.ddhh2.out
diff --git a/tools/regression/usr.bin/jot/regress.dhdd.out b/usr.bin/jot/tests/regress.dhdd.out
index d61477b..d61477b 100644
--- a/tools/regression/usr.bin/jot/regress.dhdd.out
+++ b/usr.bin/jot/tests/regress.dhdd.out
diff --git a/tools/regression/usr.bin/jot/regress.dhdh.out b/usr.bin/jot/tests/regress.dhdh.out
index 1fc43dc..1fc43dc 100644
--- a/tools/regression/usr.bin/jot/regress.dhdh.out
+++ b/usr.bin/jot/tests/regress.dhdh.out
diff --git a/tools/regression/usr.bin/jot/regress.dhhd.out b/usr.bin/jot/tests/regress.dhhd.out
index d21b134..d21b134 100644
--- a/tools/regression/usr.bin/jot/regress.dhhd.out
+++ b/usr.bin/jot/tests/regress.dhhd.out
diff --git a/tools/regression/usr.bin/jot/regress.dhhd2.out b/usr.bin/jot/tests/regress.dhhd2.out
index 315826d..315826d 100644
--- a/tools/regression/usr.bin/jot/regress.dhhd2.out
+++ b/usr.bin/jot/tests/regress.dhhd2.out
diff --git a/tools/regression/usr.bin/jot/regress.dhhh.out b/usr.bin/jot/tests/regress.dhhh.out
index 302eb42..302eb42 100644
--- a/tools/regression/usr.bin/jot/regress.dhhh.out
+++ b/usr.bin/jot/tests/regress.dhhh.out
diff --git a/tools/regression/usr.bin/jot/regress.dhhh2.out b/usr.bin/jot/tests/regress.dhhh2.out
index f56b35b..f56b35b 100644
--- a/tools/regression/usr.bin/jot/regress.dhhh2.out
+++ b/usr.bin/jot/tests/regress.dhhh2.out
diff --git a/tools/regression/usr.bin/jot/regress.ed.out b/usr.bin/jot/tests/regress.ed.out
index d82a36d..d82a36d 100644
--- a/tools/regression/usr.bin/jot/regress.ed.out
+++ b/usr.bin/jot/tests/regress.ed.out
diff --git a/tools/regression/usr.bin/jot/regress.grep.out b/usr.bin/jot/tests/regress.grep.out
index b6578ef..b6578ef 100644
--- a/tools/regression/usr.bin/jot/regress.grep.out
+++ b/usr.bin/jot/tests/regress.grep.out
diff --git a/tools/regression/usr.bin/jot/regress.hddd.out b/usr.bin/jot/tests/regress.hddd.out
index 96cc558..96cc558 100644
--- a/tools/regression/usr.bin/jot/regress.hddd.out
+++ b/usr.bin/jot/tests/regress.hddd.out
diff --git a/tools/regression/usr.bin/jot/regress.hddd2.out b/usr.bin/jot/tests/regress.hddd2.out
index e8823e1..e8823e1 100644
--- a/tools/regression/usr.bin/jot/regress.hddd2.out
+++ b/usr.bin/jot/tests/regress.hddd2.out
diff --git a/tools/regression/usr.bin/jot/regress.hddh.out b/usr.bin/jot/tests/regress.hddh.out
index 7927325..7927325 100644
--- a/tools/regression/usr.bin/jot/regress.hddh.out
+++ b/usr.bin/jot/tests/regress.hddh.out
diff --git a/tools/regression/usr.bin/jot/regress.hddh2.out b/usr.bin/jot/tests/regress.hddh2.out
index da7d98b..da7d98b 100644
--- a/tools/regression/usr.bin/jot/regress.hddh2.out
+++ b/usr.bin/jot/tests/regress.hddh2.out
diff --git a/tools/regression/usr.bin/jot/regress.hdhd.out b/usr.bin/jot/tests/regress.hdhd.out
index 32ee48f..32ee48f 100644
--- a/tools/regression/usr.bin/jot/regress.hdhd.out
+++ b/usr.bin/jot/tests/regress.hdhd.out
diff --git a/tools/regression/usr.bin/jot/regress.hdhd2.out b/usr.bin/jot/tests/regress.hdhd2.out
index eaa2cdc..eaa2cdc 100644
--- a/tools/regression/usr.bin/jot/regress.hdhd2.out
+++ b/usr.bin/jot/tests/regress.hdhd2.out
diff --git a/tools/regression/usr.bin/jot/regress.hdhh.out b/usr.bin/jot/tests/regress.hdhh.out
index d06ebfa..d06ebfa 100644
--- a/tools/regression/usr.bin/jot/regress.hdhh.out
+++ b/usr.bin/jot/tests/regress.hdhh.out
diff --git a/tools/regression/usr.bin/jot/regress.hdhh2.out b/usr.bin/jot/tests/regress.hdhh2.out
index 3a412e6..3a412e6 100644
--- a/tools/regression/usr.bin/jot/regress.hdhh2.out
+++ b/usr.bin/jot/tests/regress.hdhh2.out
diff --git a/tools/regression/usr.bin/jot/regress.hhdd.out b/usr.bin/jot/tests/regress.hhdd.out
index 8d9aa35..8d9aa35 100644
--- a/tools/regression/usr.bin/jot/regress.hhdd.out
+++ b/usr.bin/jot/tests/regress.hhdd.out
diff --git a/tools/regression/usr.bin/jot/regress.hhdd2.out b/usr.bin/jot/tests/regress.hhdd2.out
index ae3c906..ae3c906 100644
--- a/tools/regression/usr.bin/jot/regress.hhdd2.out
+++ b/usr.bin/jot/tests/regress.hhdd2.out
diff --git a/tools/regression/usr.bin/jot/regress.hhdh.out b/usr.bin/jot/tests/regress.hhdh.out
index 520f4ef..520f4ef 100644
--- a/tools/regression/usr.bin/jot/regress.hhdh.out
+++ b/usr.bin/jot/tests/regress.hhdh.out
diff --git a/tools/regression/usr.bin/jot/regress.hhdh2.out b/usr.bin/jot/tests/regress.hhdh2.out
index 5b289bf..5b289bf 100644
--- a/tools/regression/usr.bin/jot/regress.hhdh2.out
+++ b/usr.bin/jot/tests/regress.hhdh2.out
diff --git a/tools/regression/usr.bin/jot/regress.hhhd.out b/usr.bin/jot/tests/regress.hhhd.out
index f5ddbc5..f5ddbc5 100644
--- a/tools/regression/usr.bin/jot/regress.hhhd.out
+++ b/usr.bin/jot/tests/regress.hhhd.out
diff --git a/tools/regression/usr.bin/jot/regress.hhhd2.out b/usr.bin/jot/tests/regress.hhhd2.out
index e6a8c4f..e6a8c4f 100644
--- a/tools/regression/usr.bin/jot/regress.hhhd2.out
+++ b/usr.bin/jot/tests/regress.hhhd2.out
diff --git a/tools/regression/usr.bin/jot/regress.hhhh.out b/usr.bin/jot/tests/regress.hhhh.out
index 520f4ef..520f4ef 100644
--- a/tools/regression/usr.bin/jot/regress.hhhh.out
+++ b/usr.bin/jot/tests/regress.hhhh.out
diff --git a/tools/regression/usr.bin/jot/regress.hhhh2.out b/usr.bin/jot/tests/regress.hhhh2.out
index 5b289bf..5b289bf 100644
--- a/tools/regression/usr.bin/jot/regress.hhhh2.out
+++ b/usr.bin/jot/tests/regress.hhhh2.out
diff --git a/tools/regression/usr.bin/jot/regress.n21.out b/usr.bin/jot/tests/regress.n21.out
index 89b0879..89b0879 100644
--- a/tools/regression/usr.bin/jot/regress.n21.out
+++ b/usr.bin/jot/tests/regress.n21.out
diff --git a/tools/regression/usr.bin/jot/regress.rand1.out b/usr.bin/jot/tests/regress.rand1.out
index 8b1acc1..8b1acc1 100644
--- a/tools/regression/usr.bin/jot/regress.rand1.out
+++ b/usr.bin/jot/tests/regress.rand1.out
diff --git a/tools/regression/usr.bin/jot/regress.rand2.out b/usr.bin/jot/tests/regress.rand2.out
index 8b1acc1..8b1acc1 100644
--- a/tools/regression/usr.bin/jot/regress.rand2.out
+++ b/usr.bin/jot/tests/regress.rand2.out
diff --git a/tools/regression/usr.bin/jot/regress.sh b/usr.bin/jot/tests/regress.sh
index 7f6c566..7f6c566 100644
--- a/tools/regression/usr.bin/jot/regress.sh
+++ b/usr.bin/jot/tests/regress.sh
diff --git a/tools/regression/usr.bin/jot/regress.stutter.out b/usr.bin/jot/tests/regress.stutter.out
index 10eb87d..10eb87d 100644
--- a/tools/regression/usr.bin/jot/regress.stutter.out
+++ b/usr.bin/jot/tests/regress.stutter.out
diff --git a/tools/regression/usr.bin/jot/regress.stutter2.out b/usr.bin/jot/tests/regress.stutter2.out
index 44e0ba1..44e0ba1 100644
--- a/tools/regression/usr.bin/jot/regress.stutter2.out
+++ b/usr.bin/jot/tests/regress.stutter2.out
diff --git a/tools/regression/usr.bin/jot/regress.tabs.out b/usr.bin/jot/tests/regress.tabs.out
index 7859413..7859413 100644
--- a/tools/regression/usr.bin/jot/regress.tabs.out
+++ b/usr.bin/jot/tests/regress.tabs.out
diff --git a/tools/regression/usr.bin/jot/regress.wX1.out b/usr.bin/jot/tests/regress.wX1.out
index dc7f5e9..dc7f5e9 100644
--- a/tools/regression/usr.bin/jot/regress.wX1.out
+++ b/usr.bin/jot/tests/regress.wX1.out
diff --git a/tools/regression/usr.bin/jot/regress.wXl.out b/usr.bin/jot/tests/regress.wXl.out
index cf6b9b7..cf6b9b7 100644
--- a/tools/regression/usr.bin/jot/regress.wXl.out
+++ b/usr.bin/jot/tests/regress.wXl.out
diff --git a/tools/regression/usr.bin/jot/regress.wc.out b/usr.bin/jot/tests/regress.wc.out
index f6e77d9..f6e77d9 100644
--- a/tools/regression/usr.bin/jot/regress.wc.out
+++ b/usr.bin/jot/tests/regress.wc.out
diff --git a/tools/regression/usr.bin/jot/regress.wdl.out b/usr.bin/jot/tests/regress.wdl.out
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/jot/regress.wdl.out
+++ b/usr.bin/jot/tests/regress.wdl.out
diff --git a/tools/regression/usr.bin/jot/regress.wdn.out b/usr.bin/jot/tests/regress.wdn.out
index c4027de..c4027de 100644
--- a/tools/regression/usr.bin/jot/regress.wdn.out
+++ b/usr.bin/jot/tests/regress.wdn.out
diff --git a/tools/regression/usr.bin/jot/regress.we.out b/usr.bin/jot/tests/regress.we.out
index 5a3727d..5a3727d 100644
--- a/tools/regression/usr.bin/jot/regress.we.out
+++ b/usr.bin/jot/tests/regress.we.out
diff --git a/tools/regression/usr.bin/jot/regress.wf.out b/usr.bin/jot/tests/regress.wf.out
index 7fd3021..7fd3021 100644
--- a/tools/regression/usr.bin/jot/regress.wf.out
+++ b/usr.bin/jot/tests/regress.wf.out
diff --git a/tools/regression/usr.bin/jot/regress.wg.out b/usr.bin/jot/tests/regress.wg.out
index 5c33e35..5c33e35 100644
--- a/tools/regression/usr.bin/jot/regress.wg.out
+++ b/usr.bin/jot/tests/regress.wg.out
diff --git a/tools/regression/usr.bin/jot/regress.wgd.out b/usr.bin/jot/tests/regress.wgd.out
index 0f3f96d0..0f3f96d0 100644
--- a/tools/regression/usr.bin/jot/regress.wgd.out
+++ b/usr.bin/jot/tests/regress.wgd.out
diff --git a/tools/regression/usr.bin/jot/regress.wo.out b/usr.bin/jot/tests/regress.wo.out
index 4c89c92..4c89c92 100644
--- a/tools/regression/usr.bin/jot/regress.wo.out
+++ b/usr.bin/jot/tests/regress.wo.out
diff --git a/tools/regression/usr.bin/jot/regress.wp1.out b/usr.bin/jot/tests/regress.wp1.out
index 6a5e94c..6a5e94c 100644
--- a/tools/regression/usr.bin/jot/regress.wp1.out
+++ b/usr.bin/jot/tests/regress.wp1.out
diff --git a/tools/regression/usr.bin/jot/regress.wp2.out b/usr.bin/jot/tests/regress.wp2.out
index a489d69..a489d69 100644
--- a/tools/regression/usr.bin/jot/regress.wp2.out
+++ b/usr.bin/jot/tests/regress.wp2.out
diff --git a/tools/regression/usr.bin/jot/regress.wp3.out b/usr.bin/jot/tests/regress.wp3.out
index 95e31bb..95e31bb 100644
--- a/tools/regression/usr.bin/jot/regress.wp3.out
+++ b/usr.bin/jot/tests/regress.wp3.out
diff --git a/tools/regression/usr.bin/jot/regress.wp4.out b/usr.bin/jot/tests/regress.wp4.out
index cd177b2..cd177b2 100644
--- a/tools/regression/usr.bin/jot/regress.wp4.out
+++ b/usr.bin/jot/tests/regress.wp4.out
diff --git a/tools/regression/usr.bin/jot/regress.wp5.out b/usr.bin/jot/tests/regress.wp5.out
index 2889d8f..2889d8f 100644
--- a/tools/regression/usr.bin/jot/regress.wp5.out
+++ b/usr.bin/jot/tests/regress.wp5.out
diff --git a/tools/regression/usr.bin/jot/regress.wp6.out b/usr.bin/jot/tests/regress.wp6.out
index 1f097f0..1f097f0 100644
--- a/tools/regression/usr.bin/jot/regress.wp6.out
+++ b/usr.bin/jot/tests/regress.wp6.out
diff --git a/tools/regression/usr.bin/jot/regress.wu.out b/usr.bin/jot/tests/regress.wu.out
index c39e5f6..c39e5f6 100644
--- a/tools/regression/usr.bin/jot/regress.wu.out
+++ b/usr.bin/jot/tests/regress.wu.out
diff --git a/tools/regression/usr.bin/jot/regress.wwe.out b/usr.bin/jot/tests/regress.wwe.out
index 7c873a5..7c873a5 100644
--- a/tools/regression/usr.bin/jot/regress.wwe.out
+++ b/usr.bin/jot/tests/regress.wwe.out
diff --git a/tools/regression/usr.bin/jot/regress.wx.out b/usr.bin/jot/tests/regress.wx.out
index 5520d01..5520d01 100644
--- a/tools/regression/usr.bin/jot/regress.wx.out
+++ b/usr.bin/jot/tests/regress.wx.out
diff --git a/tools/regression/usr.bin/jot/regress.wxn.out b/usr.bin/jot/tests/regress.wxn.out
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/jot/regress.wxn.out
+++ b/usr.bin/jot/tests/regress.wxn.out
diff --git a/tools/regression/usr.bin/jot/regress.x.out b/usr.bin/jot/tests/regress.x.out
index b109793..b109793 100644
--- a/tools/regression/usr.bin/jot/regress.x.out
+++ b/usr.bin/jot/tests/regress.x.out
diff --git a/tools/regression/usr.bin/jot/regress.xaa.out b/usr.bin/jot/tests/regress.xaa.out
index b14f9a0..b14f9a0 100644
--- a/tools/regression/usr.bin/jot/regress.xaa.out
+++ b/usr.bin/jot/tests/regress.xaa.out
diff --git a/tools/regression/usr.bin/jot/regress.yes.out b/usr.bin/jot/tests/regress.yes.out
index 74e8d37..74e8d37 100644
--- a/tools/regression/usr.bin/jot/regress.yes.out
+++ b/usr.bin/jot/tests/regress.yes.out
diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile
index 84708d9..8825375 100644
--- a/usr.bin/lastcomm/Makefile
+++ b/usr.bin/lastcomm/Makefile
@@ -1,7 +1,13 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	lastcomm
 SRCS=	lastcomm.c readrec.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/lastcomm/tests/Makefile b/usr.bin/lastcomm/tests/Makefile
new file mode 100644
index 0000000..b0fac0e
--- /dev/null
+++ b/usr.bin/lastcomm/tests/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/lastcomm
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		v1-amd64-acct.in
+FILES+=		v1-amd64.out
+FILES+=		v1-i386-acct.in
+FILES+=		v1-i386.out
+FILES+=		v1-sparc64-acct.in
+FILES+=		v1-sparc64.out
+FILES+=		v2-amd64-acct.in
+FILES+=		v2-amd64.out
+FILES+=		v2-i386-acct.in
+FILES+=		v2-i386.out
+FILES+=		v2-sparc64-acct.in
+FILES+=		v2-sparc64.out
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/lastcomm/README b/usr.bin/lastcomm/tests/README
index 62e0281..62e0281 100644
--- a/tools/regression/usr.bin/lastcomm/README
+++ b/usr.bin/lastcomm/tests/README
diff --git a/usr.bin/lastcomm/tests/legacy_test.sh b/usr.bin/lastcomm/tests/legacy_test.sh
new file mode 100644
index 0000000..35ef78b
--- /dev/null
+++ b/usr.bin/lastcomm/tests/legacy_test.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+DIR=`dirname $0`
+ARCH=`uname -m`
+
+TZ=UTC; export TZ
+
+check()
+{
+	NUM=$1
+	shift
+	# Remove tty field, which varies between systems.
+	awk '{$4 = ""; print}' |
+	if diff -q - $1
+	then
+		echo "ok $NUM"
+	else
+		echo "not ok $NUM"
+	fi
+}
+
+
+cat $DIR/v1-$ARCH-acct.in $DIR/v2-$ARCH-acct.in >v1v2-$ARCH-acct.in
+cat $DIR/v2-$ARCH.out $DIR/v1-$ARCH.out >v1v2-$ARCH.out
+
+echo 1..6
+
+lastcomm -cesuS -f $DIR/v1-$ARCH-acct.in | check 1 $DIR/v1-$ARCH.out
+lastcomm -cesuS -f - <$DIR/v1-$ARCH-acct.in | tail -r | check 2 $DIR/v1-$ARCH.out
+lastcomm -cesuS -f $DIR/v2-$ARCH-acct.in | check 3 $DIR/v2-$ARCH.out
+lastcomm -cesuS -f - <$DIR/v2-$ARCH-acct.in | tail -r | check 4 $DIR/v2-$ARCH.out
+lastcomm -cesuS -f v1v2-$ARCH-acct.in | check 5 v1v2-$ARCH.out
+lastcomm -cesuS -f - <v1v2-$ARCH-acct.in | tail -r | check 6 v1v2-$ARCH.out
+
+exit 0
diff --git a/tools/regression/usr.bin/lastcomm/v1-amd64-acct.in b/usr.bin/lastcomm/tests/v1-amd64-acct.in
index 50546a3..50546a3 100644
--- a/tools/regression/usr.bin/lastcomm/v1-amd64-acct.in
+++ b/usr.bin/lastcomm/tests/v1-amd64-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v1-amd64.out b/usr.bin/lastcomm/tests/v1-amd64.out
index bacbd57..bacbd57 100644
--- a/tools/regression/usr.bin/lastcomm/v1-amd64.out
+++ b/usr.bin/lastcomm/tests/v1-amd64.out
diff --git a/tools/regression/usr.bin/lastcomm/v1-i386-acct.in b/usr.bin/lastcomm/tests/v1-i386-acct.in
index f427c0e..f427c0e 100644
--- a/tools/regression/usr.bin/lastcomm/v1-i386-acct.in
+++ b/usr.bin/lastcomm/tests/v1-i386-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v1-i386.out b/usr.bin/lastcomm/tests/v1-i386.out
index 86ec9e2..86ec9e2 100644
--- a/tools/regression/usr.bin/lastcomm/v1-i386.out
+++ b/usr.bin/lastcomm/tests/v1-i386.out
diff --git a/tools/regression/usr.bin/lastcomm/v1-sparc64-acct.in b/usr.bin/lastcomm/tests/v1-sparc64-acct.in
index 00f05b4..00f05b4 100644
--- a/tools/regression/usr.bin/lastcomm/v1-sparc64-acct.in
+++ b/usr.bin/lastcomm/tests/v1-sparc64-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v1-sparc64.out b/usr.bin/lastcomm/tests/v1-sparc64.out
index d33ae71..d33ae71 100644
--- a/tools/regression/usr.bin/lastcomm/v1-sparc64.out
+++ b/usr.bin/lastcomm/tests/v1-sparc64.out
diff --git a/tools/regression/usr.bin/lastcomm/v2-amd64-acct.in b/usr.bin/lastcomm/tests/v2-amd64-acct.in
index ca7bcaa..ca7bcaa 100644
--- a/tools/regression/usr.bin/lastcomm/v2-amd64-acct.in
+++ b/usr.bin/lastcomm/tests/v2-amd64-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v2-amd64.out b/usr.bin/lastcomm/tests/v2-amd64.out
index 3942b04..3942b04 100644
--- a/tools/regression/usr.bin/lastcomm/v2-amd64.out
+++ b/usr.bin/lastcomm/tests/v2-amd64.out
diff --git a/tools/regression/usr.bin/lastcomm/v2-i386-acct.in b/usr.bin/lastcomm/tests/v2-i386-acct.in
index 4cdd973..4cdd973 100644
--- a/tools/regression/usr.bin/lastcomm/v2-i386-acct.in
+++ b/usr.bin/lastcomm/tests/v2-i386-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v2-i386.out b/usr.bin/lastcomm/tests/v2-i386.out
index 61bc811..61bc811 100644
--- a/tools/regression/usr.bin/lastcomm/v2-i386.out
+++ b/usr.bin/lastcomm/tests/v2-i386.out
diff --git a/tools/regression/usr.bin/lastcomm/v2-sparc64-acct.in b/usr.bin/lastcomm/tests/v2-sparc64-acct.in
index 26df19e..26df19e 100644
--- a/tools/regression/usr.bin/lastcomm/v2-sparc64-acct.in
+++ b/usr.bin/lastcomm/tests/v2-sparc64-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v2-sparc64.out b/usr.bin/lastcomm/tests/v2-sparc64.out
index f693e8e..f693e8e 100644
--- a/tools/regression/usr.bin/lastcomm/v2-sparc64.out
+++ b/usr.bin/lastcomm/tests/v2-sparc64.out
diff --git a/tools/regression/usr.bin/lastcomm/values.sh b/usr.bin/lastcomm/tests/values.sh
index 6c20954..ab27f62 100644..100755
--- a/tools/regression/usr.bin/lastcomm/values.sh
+++ b/usr.bin/lastcomm/tests/values.sh
@@ -6,6 +6,7 @@
 ACCT=acct
 RESULTS=acct.`uname -m`.tar.gz
 TMPDIR=$$.tmp
+TZ=UTC; export TZ
 
 run()
 {
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index f0e22f8..e6cf0b6 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -4,6 +4,8 @@
 # -DEXTENDED 
 # 	if you want the paste & spaste macros.
 
+.include <bsd.own.mk>
+
 PROG=	m4
 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib
 DPADD=	${LIBY} ${LIBL} ${LIBM}
@@ -22,4 +24,8 @@ tokenizer.o: parser.h
 
 CLEANFILES+=	parser.c parser.h tokenizer.o
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/m4/tests/Makefile b/usr.bin/m4/tests/Makefile
new file mode 100644
index 0000000..2eebc07
--- /dev/null
+++ b/usr.bin/m4/tests/Makefile
@@ -0,0 +1,52 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/m4
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		args.m4
+FILES+=		args2.m4
+FILES+=		comments.m4
+FILES+=		esyscmd.m4
+FILES+=		eval.m4
+FILES+=		ff_after_dnl.m4.uu
+FILES+=		gnueval.m4
+FILES+=		gnuformat.m4
+FILES+=		gnupatterns.m4
+FILES+=		gnupatterns2.m4
+FILES+=		gnuprefix.m4
+FILES+=		gnusofterror.m4
+FILES+=		includes.aux
+FILES+=		includes.m4
+FILES+=		m4wrap3.m4
+FILES+=		patterns.m4
+FILES+=		quotes.m4
+FILES+=		redef.m4
+FILES+=		regress.args.out
+FILES+=		regress.args2.out
+FILES+=		regress.comments.out
+FILES+=		regress.esyscmd.out
+FILES+=		regress.eval.out
+FILES+=		regress.ff_after_dnl.out
+FILES+=		regress.gnueval.out
+FILES+=		regress.gnuformat.out
+FILES+=		regress.gnupatterns.out
+FILES+=		regress.gnupatterns2.out
+FILES+=		regress.gnuprefix.out
+FILES+=		regress.gnusofterror.out
+FILES+=		regress.gnutranslit2.out
+FILES+=		regress.includes.out
+FILES+=		regress.m4wrap3.out
+FILES+=		regress.patterns.out
+FILES+=		regress.quotes.out
+FILES+=		regress.redef.out
+FILES+=		regress.sh
+FILES+=		regress.strangequotes.out
+FILES+=		regress.translit.out
+FILES+=		regress.translit2.out
+FILES+=		strangequotes.m4.uu
+FILES+=		translit.m4
+FILES+=		translit2.m4
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/m4/args.m4 b/usr.bin/m4/tests/args.m4
index 3ad30f2..3ad30f2 100644
--- a/tools/regression/usr.bin/m4/args.m4
+++ b/usr.bin/m4/tests/args.m4
diff --git a/tools/regression/usr.bin/m4/args2.m4 b/usr.bin/m4/tests/args2.m4
index 3f9ed60..3f9ed60 100644
--- a/tools/regression/usr.bin/m4/args2.m4
+++ b/usr.bin/m4/tests/args2.m4
diff --git a/tools/regression/usr.bin/m4/comments.m4 b/usr.bin/m4/tests/comments.m4
index d7038c4..d7038c4 100644
--- a/tools/regression/usr.bin/m4/comments.m4
+++ b/usr.bin/m4/tests/comments.m4
diff --git a/tools/regression/usr.bin/m4/esyscmd.m4 b/usr.bin/m4/tests/esyscmd.m4
index 7b1342d..7b1342d 100644
--- a/tools/regression/usr.bin/m4/esyscmd.m4
+++ b/usr.bin/m4/tests/esyscmd.m4
diff --git a/tools/regression/usr.bin/m4/eval.m4 b/usr.bin/m4/tests/eval.m4
index 361f9b9..361f9b9 100644
--- a/tools/regression/usr.bin/m4/eval.m4
+++ b/usr.bin/m4/tests/eval.m4
diff --git a/tools/regression/usr.bin/m4/ff_after_dnl.m4.uu b/usr.bin/m4/tests/ff_after_dnl.m4.uu
index 222f9e3..222f9e3 100644
--- a/tools/regression/usr.bin/m4/ff_after_dnl.m4.uu
+++ b/usr.bin/m4/tests/ff_after_dnl.m4.uu
diff --git a/tools/regression/usr.bin/m4/gnueval.m4 b/usr.bin/m4/tests/gnueval.m4
index 9e7b576..9e7b576 100644
--- a/tools/regression/usr.bin/m4/gnueval.m4
+++ b/usr.bin/m4/tests/gnueval.m4
diff --git a/tools/regression/usr.bin/m4/gnuformat.m4 b/usr.bin/m4/tests/gnuformat.m4
index 429d265..429d265 100644
--- a/tools/regression/usr.bin/m4/gnuformat.m4
+++ b/usr.bin/m4/tests/gnuformat.m4
diff --git a/tools/regression/usr.bin/m4/gnupatterns.m4 b/usr.bin/m4/tests/gnupatterns.m4
index 735d1cf..735d1cf 100644
--- a/tools/regression/usr.bin/m4/gnupatterns.m4
+++ b/usr.bin/m4/tests/gnupatterns.m4
diff --git a/tools/regression/usr.bin/m4/gnupatterns2.m4 b/usr.bin/m4/tests/gnupatterns2.m4
index 23170b7..23170b7 100644
--- a/tools/regression/usr.bin/m4/gnupatterns2.m4
+++ b/usr.bin/m4/tests/gnupatterns2.m4
diff --git a/tools/regression/usr.bin/m4/gnuprefix.m4 b/usr.bin/m4/tests/gnuprefix.m4
index fff9784..fff9784 100644
--- a/tools/regression/usr.bin/m4/gnuprefix.m4
+++ b/usr.bin/m4/tests/gnuprefix.m4
diff --git a/tools/regression/usr.bin/m4/gnusofterror.m4 b/usr.bin/m4/tests/gnusofterror.m4
index 5ddc028..5ddc028 100644
--- a/tools/regression/usr.bin/m4/gnusofterror.m4
+++ b/usr.bin/m4/tests/gnusofterror.m4
diff --git a/tools/regression/usr.bin/m4/includes.aux b/usr.bin/m4/tests/includes.aux
index a977969..a977969 100644
--- a/tools/regression/usr.bin/m4/includes.aux
+++ b/usr.bin/m4/tests/includes.aux
diff --git a/tools/regression/usr.bin/m4/includes.m4 b/usr.bin/m4/tests/includes.m4
index c06e763..c06e763 100644
--- a/tools/regression/usr.bin/m4/includes.m4
+++ b/usr.bin/m4/tests/includes.m4
diff --git a/usr.bin/m4/tests/legacy_test.sh b/usr.bin/m4/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/m4/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/m4/m4wrap3.m4 b/usr.bin/m4/tests/m4wrap3.m4
index a0dffb0..a0dffb0 100644
--- a/tools/regression/usr.bin/m4/m4wrap3.m4
+++ b/usr.bin/m4/tests/m4wrap3.m4
diff --git a/tools/regression/usr.bin/m4/patterns.m4 b/usr.bin/m4/tests/patterns.m4
index e064778..e064778 100644
--- a/tools/regression/usr.bin/m4/patterns.m4
+++ b/usr.bin/m4/tests/patterns.m4
diff --git a/tools/regression/usr.bin/m4/quotes.m4 b/usr.bin/m4/tests/quotes.m4
index c783e22..c783e22 100644
--- a/tools/regression/usr.bin/m4/quotes.m4
+++ b/usr.bin/m4/tests/quotes.m4
diff --git a/tools/regression/usr.bin/m4/redef.m4 b/usr.bin/m4/tests/redef.m4
index de01f67..de01f67 100644
--- a/tools/regression/usr.bin/m4/redef.m4
+++ b/usr.bin/m4/tests/redef.m4
diff --git a/tools/regression/usr.bin/m4/regress.args.out b/usr.bin/m4/tests/regress.args.out
index aaa8900..aaa8900 100644
--- a/tools/regression/usr.bin/m4/regress.args.out
+++ b/usr.bin/m4/tests/regress.args.out
diff --git a/tools/regression/usr.bin/m4/regress.args2.out b/usr.bin/m4/tests/regress.args2.out
index 74bdbd6..74bdbd6 100644
--- a/tools/regression/usr.bin/m4/regress.args2.out
+++ b/usr.bin/m4/tests/regress.args2.out
diff --git a/tools/regression/usr.bin/m4/regress.comments.out b/usr.bin/m4/tests/regress.comments.out
index 157f107..157f107 100644
--- a/tools/regression/usr.bin/m4/regress.comments.out
+++ b/usr.bin/m4/tests/regress.comments.out
diff --git a/tools/regression/usr.bin/m4/regress.esyscmd.out b/usr.bin/m4/tests/regress.esyscmd.out
index 89a1d06..89a1d06 100644
--- a/tools/regression/usr.bin/m4/regress.esyscmd.out
+++ b/usr.bin/m4/tests/regress.esyscmd.out
diff --git a/tools/regression/usr.bin/m4/regress.eval.out b/usr.bin/m4/tests/regress.eval.out
index 7298b3f..7298b3f 100644
--- a/tools/regression/usr.bin/m4/regress.eval.out
+++ b/usr.bin/m4/tests/regress.eval.out
diff --git a/tools/regression/usr.bin/m4/regress.ff_after_dnl.out b/usr.bin/m4/tests/regress.ff_after_dnl.out
index 8e51f1e..8e51f1e 100644
--- a/tools/regression/usr.bin/m4/regress.ff_after_dnl.out
+++ b/usr.bin/m4/tests/regress.ff_after_dnl.out
diff --git a/tools/regression/usr.bin/m4/regress.gnueval.out b/usr.bin/m4/tests/regress.gnueval.out
index 6d7fd49..6d7fd49 100644
--- a/tools/regression/usr.bin/m4/regress.gnueval.out
+++ b/usr.bin/m4/tests/regress.gnueval.out
diff --git a/tools/regression/usr.bin/m4/regress.gnuformat.out b/usr.bin/m4/tests/regress.gnuformat.out
index 3f484d6..3f484d6 100644
--- a/tools/regression/usr.bin/m4/regress.gnuformat.out
+++ b/usr.bin/m4/tests/regress.gnuformat.out
diff --git a/tools/regression/usr.bin/m4/regress.gnupatterns.out b/usr.bin/m4/tests/regress.gnupatterns.out
index 8e31103..8e31103 100644
--- a/tools/regression/usr.bin/m4/regress.gnupatterns.out
+++ b/usr.bin/m4/tests/regress.gnupatterns.out
diff --git a/tools/regression/usr.bin/m4/regress.gnupatterns2.out b/usr.bin/m4/tests/regress.gnupatterns2.out
index c45944a..c45944a 100644
--- a/tools/regression/usr.bin/m4/regress.gnupatterns2.out
+++ b/usr.bin/m4/tests/regress.gnupatterns2.out
diff --git a/tools/regression/usr.bin/m4/regress.gnuprefix.out b/usr.bin/m4/tests/regress.gnuprefix.out
index 186421d..186421d 100644
--- a/tools/regression/usr.bin/m4/regress.gnuprefix.out
+++ b/usr.bin/m4/tests/regress.gnuprefix.out
diff --git a/tools/regression/usr.bin/m4/regress.gnusofterror.out b/usr.bin/m4/tests/regress.gnusofterror.out
index 322fa4c..322fa4c 100644
--- a/tools/regression/usr.bin/m4/regress.gnusofterror.out
+++ b/usr.bin/m4/tests/regress.gnusofterror.out
diff --git a/tools/regression/usr.bin/m4/regress.gnutranslit2.out b/usr.bin/m4/tests/regress.gnutranslit2.out
index 5c88e73..5c88e73 100644
--- a/tools/regression/usr.bin/m4/regress.gnutranslit2.out
+++ b/usr.bin/m4/tests/regress.gnutranslit2.out
diff --git a/tools/regression/usr.bin/m4/regress.includes.out b/usr.bin/m4/tests/regress.includes.out
index 4a1f475..4a1f475 100644
--- a/tools/regression/usr.bin/m4/regress.includes.out
+++ b/usr.bin/m4/tests/regress.includes.out
diff --git a/tools/regression/usr.bin/m4/regress.m4wrap3.out b/usr.bin/m4/tests/regress.m4wrap3.out
index 51b43f4..51b43f4 100644
--- a/tools/regression/usr.bin/m4/regress.m4wrap3.out
+++ b/usr.bin/m4/tests/regress.m4wrap3.out
diff --git a/tools/regression/usr.bin/m4/regress.patterns.out b/usr.bin/m4/tests/regress.patterns.out
index c273b58..c273b58 100644
--- a/tools/regression/usr.bin/m4/regress.patterns.out
+++ b/usr.bin/m4/tests/regress.patterns.out
diff --git a/tools/regression/usr.bin/m4/regress.quotes.out b/usr.bin/m4/tests/regress.quotes.out
index fe5b8a4..fe5b8a4 100644
--- a/tools/regression/usr.bin/m4/regress.quotes.out
+++ b/usr.bin/m4/tests/regress.quotes.out
diff --git a/tools/regression/usr.bin/m4/regress.redef.out b/usr.bin/m4/tests/regress.redef.out
index ee482f0..ee482f0 100644
--- a/tools/regression/usr.bin/m4/regress.redef.out
+++ b/usr.bin/m4/tests/regress.redef.out
diff --git a/usr.bin/m4/tests/regress.sh b/usr.bin/m4/tests/regress.sh
new file mode 100644
index 0000000..c1d8b45
--- /dev/null
+++ b/usr.bin/m4/tests/regress.sh
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+echo 1..21
+
+test_m4() {
+	m4 "${@}" 2>&1 | sed -e "s,${SRCDIR}/,,g"
+}
+
+REGRESSION_START($1)
+
+REGRESSION_TEST(`args', `test_m4 ${SRCDIR}/args.m4')
+REGRESSION_TEST(`args2', `test_m4 ${SRCDIR}/args2.m4')
+REGRESSION_TEST(`comments', `test_m4 ${SRCDIR}/comments.m4')
+REGRESSION_TEST(`esyscmd', `test_m4 ${SRCDIR}/esyscmd.m4')
+REGRESSION_TEST(`eval', `test_m4 ${SRCDIR}/eval.m4')
+REGRESSION_TEST(`ff_after_dnl', `uudecode -o /dev/stdout ${SRCDIR}/ff_after_dnl.m4.uu | m4')
+REGRESSION_TEST(`gnueval', `test_m4 -g ${SRCDIR}/gnueval.m4')
+REGRESSION_TEST(`gnuformat', `test_m4 -g ${SRCDIR}/gnuformat.m4')
+REGRESSION_TEST(`gnupatterns', `test_m4 -g ${SRCDIR}/gnupatterns.m4')
+REGRESSION_TEST(`gnupatterns2', `test_m4 -g ${SRCDIR}/gnupatterns2.m4')
+REGRESSION_TEST(`gnuprefix', `test_m4 -P ${SRCDIR}/gnuprefix.m4 2>&1')
+REGRESSION_TEST(`gnusofterror', `test_m4 -g ${SRCDIR}/gnusofterror.m4 2>&1')
+REGRESSION_TEST(`gnutranslit2', `test_m4 -g ${SRCDIR}/translit2.m4')
+REGRESSION_TEST(`includes', `test_m4 -I${SRCDIR} ${SRCDIR}/includes.m4')
+REGRESSION_TEST(`m4wrap3', `test_m4 ${SRCDIR}/m4wrap3.m4')
+REGRESSION_TEST(`patterns', `test_m4 ${SRCDIR}/patterns.m4')
+REGRESSION_TEST(`quotes', `test_m4 ${SRCDIR}/quotes.m4 2>&1')
+REGRESSION_TEST(`strangequotes', `uudecode -o /dev/stdout ${SRCDIR}/strangequotes.m4.uu | m4')
+REGRESSION_TEST(`redef', `test_m4 ${SRCDIR}/redef.m4')
+REGRESSION_TEST(`translit', `test_m4 ${SRCDIR}/translit.m4')
+REGRESSION_TEST(`translit2', `test_m4 ${SRCDIR}/translit2.m4')
+
+REGRESSION_END()
diff --git a/tools/regression/usr.bin/m4/regress.strangequotes.out b/usr.bin/m4/tests/regress.strangequotes.out
index f19297b..f19297b 100644
--- a/tools/regression/usr.bin/m4/regress.strangequotes.out
+++ b/usr.bin/m4/tests/regress.strangequotes.out
diff --git a/tools/regression/usr.bin/m4/regress.translit.out b/usr.bin/m4/tests/regress.translit.out
index 54abdd3..54abdd3 100644
--- a/tools/regression/usr.bin/m4/regress.translit.out
+++ b/usr.bin/m4/tests/regress.translit.out
diff --git a/tools/regression/usr.bin/m4/regress.translit2.out b/usr.bin/m4/tests/regress.translit2.out
index 5c56177..5c56177 100644
--- a/tools/regression/usr.bin/m4/regress.translit2.out
+++ b/usr.bin/m4/tests/regress.translit2.out
diff --git a/tools/regression/usr.bin/m4/strangequotes.m4.uu b/usr.bin/m4/tests/strangequotes.m4.uu
index e3d840f..e3d840f 100644
--- a/tools/regression/usr.bin/m4/strangequotes.m4.uu
+++ b/usr.bin/m4/tests/strangequotes.m4.uu
diff --git a/tools/regression/usr.bin/m4/translit.m4 b/usr.bin/m4/tests/translit.m4
index 19af2e1..19af2e1 100644
--- a/tools/regression/usr.bin/m4/translit.m4
+++ b/usr.bin/m4/tests/translit.m4
diff --git a/tools/regression/usr.bin/m4/translit2.m4 b/usr.bin/m4/tests/translit2.m4
index ec26c08..ec26c08 100644
--- a/tools/regression/usr.bin/m4/translit2.m4
+++ b/usr.bin/m4/tests/translit2.m4
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 4605bb3..9b8290c 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -118,4 +118,8 @@ fmake.1: make.1
 	cp ${.ALLSRC} ${.TARGET}
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/make/tests/Makefile b/usr.bin/make/tests/Makefile
new file mode 100644
index 0000000..d5bad60
--- /dev/null
+++ b/usr.bin/make/tests/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make
+
+FILESDIR=	${TESTSDIR}
+FILES=		common.sh
+FILES+=		test-new.mk
+
+TESTS_SUBDIRS=	archives
+TESTS_SUBDIRS+=	basic
+TESTS_SUBDIRS+=	execution
+TESTS_SUBDIRS+=	shell
+TESTS_SUBDIRS+=	suffixes
+TESTS_SUBDIRS+=	syntax
+TESTS_SUBDIRS+=	sysmk
+TESTS_SUBDIRS+=	variables
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/README b/usr.bin/make/tests/README
index 32b4ddc..1ac209b 100644
--- a/tools/regression/usr.bin/make/README
+++ b/usr.bin/make/tests/README
@@ -2,9 +2,7 @@ $FreeBSD$
 
 This directory contains regression tests for make(1).
 
-To invoke the tests install prove(1) from ports/devel/p5-Test-Harness and
-run 'prove -r'. Alternatively one can use 'sh ./all.sh test' and scan the
-output for '^not ok'.
+To invoke the tests, please refer to tests(7).
 
 ----------------------------------------------------------------------------
 
diff --git a/usr.bin/make/tests/archives/Makefile b/usr.bin/make/tests/archives/Makefile
new file mode 100644
index 0000000..f8944e0
--- /dev/null
+++ b/usr.bin/make/tests/archives/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives
+
+TESTS_SUBDIRS=	fmt_44bsd fmt_44bsd_mod fmt_oldbsd
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/Makefile b/usr.bin/make/tests/archives/fmt_44bsd/Makefile
new file mode 100644
index 0000000..bf6ad40
--- /dev/null
+++ b/usr.bin/make/tests/archives/fmt_44bsd/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.status.6
+FILES+=		expected.status.7
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stderr.6
+FILES+=		expected.stderr.7
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+FILES+=		expected.stdout.6
+FILES+=		expected.stdout.7
+FILES+=		libtest.a
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile b/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test
index 5a8b065..5a8b065 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile
+++ b/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5
index 7b91643..7b91643 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6
index fd15190..fd15190 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7
index cb572e1..cb572e1 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t b/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh
index eba6aed..2604c96 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t
+++ b/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Archive parsing (BSD4.4 format)."
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a b/usr.bin/make/tests/archives/fmt_44bsd/libtest.a
index 891ce6e..891ce6e 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a
+++ b/usr.bin/make/tests/archives/fmt_44bsd/libtest.a
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
new file mode 100644
index 0000000..8d63b64
--- /dev/null
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd_mod
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.status.6
+FILES+=		expected.status.7
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stderr.6
+FILES+=		expected.stderr.7
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+FILES+=		expected.stdout.6
+FILES+=		expected.stdout.7
+FILES+=		libtest.a
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile b/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test
index cd999da..cd999da 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5
index 7b91643..7b91643 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6
index fd15190..fd15190 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7
index cb572e1..cb572e1 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t b/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh
index aa65a3e..bf13f22 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Archive parsing (modified BSD4.4 format)."
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a b/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a
index 57bc407..57bc407 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile b/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
new file mode 100644
index 0000000..ab1c383
--- /dev/null
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_oldbsd
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.status.6
+FILES+=		expected.status.7
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stderr.6
+FILES+=		expected.stderr.7
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+FILES+=		expected.stdout.6
+FILES+=		expected.stdout.7
+FILES+=		libtest.a
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile b/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test
index b8f5116..b8f5116 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6
index fd15190..fd15190 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7
index cb572e1..cb572e1 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t b/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh
index 03f7800..c7980c5 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Archive parsing (old BSD format)."
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a b/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a
index 3434c53..3434c53 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a
diff --git a/usr.bin/make/tests/basic/Makefile b/usr.bin/make/tests/basic/Makefile
new file mode 100644
index 0000000..fd7044e
--- /dev/null
+++ b/usr.bin/make/tests/basic/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic
+
+TESTS_SUBDIRS=	t0 t1 t2 t3
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/basic/t0/Makefile b/usr.bin/make/tests/basic/t0/Makefile
new file mode 100644
index 0000000..ef390dd
--- /dev/null
+++ b/usr.bin/make/tests/basic/t0/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t0
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/basic/t0/expected.status.1 b/usr.bin/make/tests/basic/t0/expected.status.1
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/basic/t0/expected.status.1
+++ b/usr.bin/make/tests/basic/t0/expected.status.1
diff --git a/tools/regression/usr.bin/make/basic/t0/expected.stderr.1 b/usr.bin/make/tests/basic/t0/expected.stderr.1
index 90280c8..90280c8 100644
--- a/tools/regression/usr.bin/make/basic/t0/expected.stderr.1
+++ b/usr.bin/make/tests/basic/t0/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/basic/t0/expected.stdout.1 b/usr.bin/make/tests/basic/t0/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t0/expected.stdout.1
+++ b/usr.bin/make/tests/basic/t0/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/basic/t0/test.t b/usr.bin/make/tests/basic/t0/legacy_test.sh
index d71a39a..d23418a 100644
--- a/tools/regression/usr.bin/make/basic/t0/test.t
+++ b/usr.bin/make/tests/basic/t0/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="An empty Makefile file and no target given."
diff --git a/usr.bin/make/tests/basic/t1/Makefile b/usr.bin/make/tests/basic/t1/Makefile
new file mode 100644
index 0000000..efd9030
--- /dev/null
+++ b/usr.bin/make/tests/basic/t1/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/basic/t1/Makefile b/usr.bin/make/tests/basic/t1/Makefile.test
index d120087..d120087 100644
--- a/tools/regression/usr.bin/make/basic/t1/Makefile
+++ b/usr.bin/make/tests/basic/t1/Makefile.test
diff --git a/tools/regression/usr.bin/make/basic/t1/expected.status.1 b/usr.bin/make/tests/basic/t1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/basic/t1/expected.status.1
+++ b/usr.bin/make/tests/basic/t1/expected.status.1
diff --git a/tools/regression/usr.bin/make/basic/t1/expected.stderr.1 b/usr.bin/make/tests/basic/t1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t1/expected.stderr.1
+++ b/usr.bin/make/tests/basic/t1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/basic/t1/expected.stdout.1 b/usr.bin/make/tests/basic/t1/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t1/expected.stdout.1
+++ b/usr.bin/make/tests/basic/t1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/basic/t1/test.t b/usr.bin/make/tests/basic/t1/legacy_test.sh
index 4131f5d..b07f927 100644
--- a/tools/regression/usr.bin/make/basic/t1/test.t
+++ b/usr.bin/make/tests/basic/t1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="A Makefile file with only a 'all:' file dependency specification."
diff --git a/usr.bin/make/tests/basic/t2/Makefile b/usr.bin/make/tests/basic/t2/Makefile
new file mode 100644
index 0000000..4b598ea
--- /dev/null
+++ b/usr.bin/make/tests/basic/t2/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t2
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/basic/t2/Makefile b/usr.bin/make/tests/basic/t2/Makefile.test
index ab8fe49..ab8fe49 100644
--- a/tools/regression/usr.bin/make/basic/t2/Makefile
+++ b/usr.bin/make/tests/basic/t2/Makefile.test
diff --git a/tools/regression/usr.bin/make/basic/t2/expected.status.1 b/usr.bin/make/tests/basic/t2/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/basic/t2/expected.status.1
+++ b/usr.bin/make/tests/basic/t2/expected.status.1
diff --git a/tools/regression/usr.bin/make/basic/t2/expected.stderr.1 b/usr.bin/make/tests/basic/t2/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t2/expected.stderr.1
+++ b/usr.bin/make/tests/basic/t2/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/basic/t2/expected.stdout.1 b/usr.bin/make/tests/basic/t2/expected.stdout.1
index e618540..e618540 100644
--- a/tools/regression/usr.bin/make/basic/t2/expected.stdout.1
+++ b/usr.bin/make/tests/basic/t2/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/basic/t2/test.t b/usr.bin/make/tests/basic/t2/legacy_test.sh
index f5866bb..da4c60a 100644
--- a/tools/regression/usr.bin/make/basic/t2/test.t
+++ b/usr.bin/make/tests/basic/t2/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="A Makefile file with only a 'all:' file dependency specification, and shell command."
diff --git a/usr.bin/make/tests/basic/t3/Makefile b/usr.bin/make/tests/basic/t3/Makefile
new file mode 100644
index 0000000..00c3757
--- /dev/null
+++ b/usr.bin/make/tests/basic/t3/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t3
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/basic/t3/expected.status.1 b/usr.bin/make/tests/basic/t3/expected.status.1
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/basic/t3/expected.status.1
+++ b/usr.bin/make/tests/basic/t3/expected.status.1
diff --git a/tools/regression/usr.bin/make/basic/t3/expected.stderr.1 b/usr.bin/make/tests/basic/t3/expected.stderr.1
index 90280c8..90280c8 100644
--- a/tools/regression/usr.bin/make/basic/t3/expected.stderr.1
+++ b/usr.bin/make/tests/basic/t3/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/basic/t3/expected.stdout.1 b/usr.bin/make/tests/basic/t3/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t3/expected.stdout.1
+++ b/usr.bin/make/tests/basic/t3/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/basic/t3/test.t b/usr.bin/make/tests/basic/t3/legacy_test.sh
index 782d27c..3c41bb3 100644
--- a/tools/regression/usr.bin/make/basic/t3/test.t
+++ b/usr.bin/make/tests/basic/t3/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="No Makefile file, no command line target."
diff --git a/tools/regression/usr.bin/make/common.sh b/usr.bin/make/tests/common.sh
index cc7622e..5c5df1e 100644
--- a/tools/regression/usr.bin/make/common.sh
+++ b/usr.bin/make/tests/common.sh
@@ -1,8 +1,6 @@
-#!/bin/sh
+# $FreeBSD$
 #
 # Common code used run regression tests for usr.bin/make.
-#
-# $FreeBSD$
 
 #
 # Output a message and exit with an error.
@@ -99,8 +97,8 @@ common_setup()
 	#
 	# If a Makefile exists in the source directory - copy it over
 	#
-	if [ -e Makefile -a ! -e ${WORK_DIR}/Makefile ] ; then
-		cp Makefile ${WORK_DIR}/Makefile
+	if [ -e ${SRC_DIR}/Makefile.test -a ! -e ${WORK_DIR}/Makefile ] ; then
+		cp ${SRC_DIR}/Makefile.test ${WORK_DIR}/Makefile
 	fi
 
 	#
@@ -123,10 +121,11 @@ common_setup()
 	#
 	set -- ${TEST_COPY_FILES}
 	while [ $# -ne 0 ] ; do
-		if [ ! -e ${WORK_DIR}/${1} ] ; then
-			cp ${1} ${WORK_DIR}/${1}
+		local dstname="$(echo ${1} | sed -e 's,Makefile.test,Makefile,')"
+		if [ ! -e ${WORK_DIR}/${dstname} ] ; then
+			cp ${SRC_DIR}/${1} ${WORK_DIR}/${dstname}
 		fi
-		chmod ${2} ${WORK_DIR}/${1}
+		chmod ${2} ${WORK_DIR}/${dstname}
 		shift ; shift
 	done
 
@@ -338,23 +337,24 @@ eval_compare()
 		else
 			eval skip=\${TEST_${N}_SKIP}
 		fi
+		msg=
 		if [ ! -z "$fail" ]; then
-			echo -n "not "
+			msg="${msg}not "
 		fi
-		echo -n "ok ${N} ${SUBDIR}/${N}"
+		msg="${msg}ok ${N} ${SUBDIR}/${N}"
 		if [ ! -z "$fail" -o ! -z "$todo" -o ! -z "$skip" ]; then
-			echo -n " # "
+			msg="${msg} # "
 		fi
 		if [ ! -z "$skip" ] ; then
-			echo -n "skip $skip; "
+			msg="${msg}skip ${skip}; "
 		fi
 		if [ ! -z "$todo" ] ; then
-			echo -n "TODO $todo; "
+			msg="${msg}TODO ${todo}; "
 		fi
 		if [ ! -z "$fail" ] ; then
-			echo "reason: ${fail}"
+			msg="${msg}reason: ${fail}"
 		fi
-		echo
+		echo ${msg}
 		N=$((N + 1))
 	done
 }
@@ -368,11 +368,13 @@ eval_compare()
 do_compare()
 {
 	local EXPECTED RESULT
-	EXPECTED="expected.$1.$2"
+	EXPECTED="${SRC_DIR}/expected.$1.$2"
 	RESULT="${OUTPUT_DIR}/$1.$2"
 
 	if [ -f $EXPECTED ]; then
-		diff -q $EXPECTED $RESULT 1>/dev/null 2>/dev/null
+		cat $RESULT | sed -e "s,^$(basename $MAKE_PROG):,make:," | \
+		diff -u $EXPECTED -
+		#diff -q $EXPECTED - 1>/dev/null 2>/dev/null
 		return $?
 	else
 		return 1	# FAIL
@@ -412,7 +414,7 @@ eval_diff()
 do_diff()
 {
 	local EXPECTED RESULT
-	EXPECTED="expected.$1.$2"
+	EXPECTED="${SRC_DIR}/expected.$1.$2"
 	RESULT="${OUTPUT_DIR}/$1.$2"
 
 	echo diff -u $EXPECTED $RESULT
@@ -513,49 +515,16 @@ eval_cmd()
 #
 
 #
-# Parse command line arguments.
-#
-args=`getopt m:w:v $*`
-if [ $? != 0 ]; then
-	echo 'Usage: ...'
-	exit 2
-fi
-set -- $args
-for i; do
-	case "$i" in
-	-m)
-		MAKE_PROG="$2"
-		shift
-		shift
-		;;
-	-w)
-		WORK_BASE="$2"
-		shift
-		shift
-		;;
-	-v)
-		VERBOSE=1
-		shift
-		;;
-	--)
-		shift
-		break
-		;;
-	esac
-done
-
-#
 # Determine our sub-directory. Argh.
 #
-SRC_DIR=`pwd`
-SRC_BASE=`while [ ! -f common.sh ] ; do cd .. ; done ; pwd`
+SRC_DIR=$(dirname $0)
+SRC_BASE=`cd ${SRC_DIR} ; while [ ! -f common.sh ] ; do cd .. ; done ; pwd`
 SUBDIR=`echo ${SRC_DIR} | sed "s@${SRC_BASE}/@@"`
 
 #
 # Construct working directory
 #
-WORK_BASE=${WORK_BASE:-"/tmp/$USER.make.test"}
-WORK_DIR=${WORK_BASE}/${SUBDIR}
+WORK_DIR=$(pwd)/work/${SUBDIR}
 OUTPUT_DIR=${WORK_DIR}.OUTPUT
 
 #
diff --git a/usr.bin/make/tests/execution/Makefile b/usr.bin/make/tests/execution/Makefile
new file mode 100644
index 0000000..52ba9b7
--- /dev/null
+++ b/usr.bin/make/tests/execution/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution
+
+TESTS_SUBDIRS=	ellipsis empty joberr plus
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/execution/ellipsis/Makefile b/usr.bin/make/tests/execution/ellipsis/Makefile
new file mode 100644
index 0000000..7f3dc3e
--- /dev/null
+++ b/usr.bin/make/tests/execution/ellipsis/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/ellipsis
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/Makefile b/usr.bin/make/tests/execution/ellipsis/Makefile.test
index d19f642..d19f642 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/Makefile
+++ b/usr.bin/make/tests/execution/ellipsis/Makefile.test
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 b/usr.bin/make/tests/execution/ellipsis/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1
+++ b/usr.bin/make/tests/execution/ellipsis/expected.status.1
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1 b/usr.bin/make/tests/execution/ellipsis/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1
+++ b/usr.bin/make/tests/execution/ellipsis/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 b/usr.bin/make/tests/execution/ellipsis/expected.stdout.1
index a7e5727..a7e5727 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1
+++ b/usr.bin/make/tests/execution/ellipsis/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/test.t b/usr.bin/make/tests/execution/ellipsis/legacy_test.sh
index c042995..9e9cd01 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/test.t
+++ b/usr.bin/make/tests/execution/ellipsis/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Ellipsis command from variable"
diff --git a/usr.bin/make/tests/execution/empty/Makefile b/usr.bin/make/tests/execution/empty/Makefile
new file mode 100644
index 0000000..31c2714
--- /dev/null
+++ b/usr.bin/make/tests/execution/empty/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/empty
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/execution/empty/Makefile b/usr.bin/make/tests/execution/empty/Makefile.test
index f687bce..f687bce 100644
--- a/tools/regression/usr.bin/make/execution/empty/Makefile
+++ b/usr.bin/make/tests/execution/empty/Makefile.test
diff --git a/tools/regression/usr.bin/make/execution/empty/expected.status.1 b/usr.bin/make/tests/execution/empty/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/execution/empty/expected.status.1
+++ b/usr.bin/make/tests/execution/empty/expected.status.1
diff --git a/tools/regression/usr.bin/make/execution/empty/expected.stderr.1 b/usr.bin/make/tests/execution/empty/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/execution/empty/expected.stderr.1
+++ b/usr.bin/make/tests/execution/empty/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/execution/empty/expected.stdout.1 b/usr.bin/make/tests/execution/empty/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/execution/empty/expected.stdout.1
+++ b/usr.bin/make/tests/execution/empty/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/execution/empty/test.t b/usr.bin/make/tests/execution/empty/legacy_test.sh
index 433d342..e02d175 100644
--- a/tools/regression/usr.bin/make/execution/empty/test.t
+++ b/usr.bin/make/tests/execution/empty/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Empty command (from variable)"
diff --git a/usr.bin/make/tests/execution/joberr/Makefile b/usr.bin/make/tests/execution/joberr/Makefile
new file mode 100644
index 0000000..eb77957
--- /dev/null
+++ b/usr.bin/make/tests/execution/joberr/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/joberr
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/execution/joberr/Makefile b/usr.bin/make/tests/execution/joberr/Makefile.test
index aca86e8..aca86e8 100644
--- a/tools/regression/usr.bin/make/execution/joberr/Makefile
+++ b/usr.bin/make/tests/execution/joberr/Makefile.test
diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.status.1 b/usr.bin/make/tests/execution/joberr/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/execution/joberr/expected.status.1
+++ b/usr.bin/make/tests/execution/joberr/expected.status.1
diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1 b/usr.bin/make/tests/execution/joberr/expected.stderr.1
index d0c8a2e..d0c8a2e 100644
--- a/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1
+++ b/usr.bin/make/tests/execution/joberr/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 b/usr.bin/make/tests/execution/joberr/expected.stdout.1
index 0ee28f4..0ee28f4 100644
--- a/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1
+++ b/usr.bin/make/tests/execution/joberr/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/execution/joberr/test.t b/usr.bin/make/tests/execution/joberr/legacy_test.sh
index 8e07958..429bfe1 100644
--- a/tools/regression/usr.bin/make/execution/joberr/test.t
+++ b/usr.bin/make/tests/execution/joberr/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Test job make error output"
diff --git a/usr.bin/make/tests/execution/plus/Makefile b/usr.bin/make/tests/execution/plus/Makefile
new file mode 100644
index 0000000..2dea979
--- /dev/null
+++ b/usr.bin/make/tests/execution/plus/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/plus
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/execution/plus/Makefile b/usr.bin/make/tests/execution/plus/Makefile.test
index ae3bdc3..ae3bdc3 100644
--- a/tools/regression/usr.bin/make/execution/plus/Makefile
+++ b/usr.bin/make/tests/execution/plus/Makefile.test
diff --git a/tools/regression/usr.bin/make/execution/plus/expected.status.1 b/usr.bin/make/tests/execution/plus/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/execution/plus/expected.status.1
+++ b/usr.bin/make/tests/execution/plus/expected.status.1
diff --git a/tools/regression/usr.bin/make/execution/plus/expected.stderr.1 b/usr.bin/make/tests/execution/plus/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/execution/plus/expected.stderr.1
+++ b/usr.bin/make/tests/execution/plus/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/execution/plus/expected.stdout.1 b/usr.bin/make/tests/execution/plus/expected.stdout.1
index b334fc7..b334fc7 100644
--- a/tools/regression/usr.bin/make/execution/plus/expected.stdout.1
+++ b/usr.bin/make/tests/execution/plus/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/execution/plus/test.t b/usr.bin/make/tests/execution/plus/legacy_test.sh
index e75b4b9..0737d1b 100644
--- a/tools/regression/usr.bin/make/execution/plus/test.t
+++ b/usr.bin/make/tests/execution/plus/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Test '+command' execution with -n -jX"
diff --git a/usr.bin/make/tests/shell/Makefile b/usr.bin/make/tests/shell/Makefile
new file mode 100644
index 0000000..cde8335
--- /dev/null
+++ b/usr.bin/make/tests/shell/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell
+
+TESTS_SUBDIRS=	builtin meta path path_select replace select
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/shell/builtin/Makefile b/usr.bin/make/tests/shell/builtin/Makefile
new file mode 100644
index 0000000..3a73215
--- /dev/null
+++ b/usr.bin/make/tests/shell/builtin/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/builtin
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		sh
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/shell/builtin/Makefile b/usr.bin/make/tests/shell/builtin/Makefile.test
index 0376478..0376478 100644
--- a/tools/regression/usr.bin/make/shell/builtin/Makefile
+++ b/usr.bin/make/tests/shell/builtin/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.1 b/usr.bin/make/tests/shell/builtin/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.status.1
+++ b/usr.bin/make/tests/shell/builtin/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.2 b/usr.bin/make/tests/shell/builtin/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.status.2
+++ b/usr.bin/make/tests/shell/builtin/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1 b/usr.bin/make/tests/shell/builtin/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1
+++ b/usr.bin/make/tests/shell/builtin/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2 b/usr.bin/make/tests/shell/builtin/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2
+++ b/usr.bin/make/tests/shell/builtin/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 b/usr.bin/make/tests/shell/builtin/expected.stdout.1
index 9c558e3..9c558e3 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1
+++ b/usr.bin/make/tests/shell/builtin/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 b/usr.bin/make/tests/shell/builtin/expected.stdout.2
index e350eaf..e350eaf 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2
+++ b/usr.bin/make/tests/shell/builtin/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/builtin/test.t b/usr.bin/make/tests/shell/builtin/legacy_test.sh
index 1798afc..6347583 100644
--- a/tools/regression/usr.bin/make/shell/builtin/test.t
+++ b/usr.bin/make/tests/shell/builtin/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Check that a command line with a builtin is passed to the shell."
diff --git a/tools/regression/usr.bin/make/shell/builtin/sh b/usr.bin/make/tests/shell/builtin/sh
index 3a507b87..3a507b87 100644
--- a/tools/regression/usr.bin/make/shell/builtin/sh
+++ b/usr.bin/make/tests/shell/builtin/sh
diff --git a/usr.bin/make/tests/shell/meta/Makefile b/usr.bin/make/tests/shell/meta/Makefile
new file mode 100644
index 0000000..ebd2177
--- /dev/null
+++ b/usr.bin/make/tests/shell/meta/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/meta
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		sh
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/shell/meta/Makefile b/usr.bin/make/tests/shell/meta/Makefile.test
index bcf19d0..bcf19d0 100644
--- a/tools/regression/usr.bin/make/shell/meta/Makefile
+++ b/usr.bin/make/tests/shell/meta/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.1 b/usr.bin/make/tests/shell/meta/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.status.1
+++ b/usr.bin/make/tests/shell/meta/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.2 b/usr.bin/make/tests/shell/meta/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.status.2
+++ b/usr.bin/make/tests/shell/meta/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.1 b/usr.bin/make/tests/shell/meta/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.stderr.1
+++ b/usr.bin/make/tests/shell/meta/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.2 b/usr.bin/make/tests/shell/meta/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.stderr.2
+++ b/usr.bin/make/tests/shell/meta/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1 b/usr.bin/make/tests/shell/meta/expected.stdout.1
index 9c558e3..9c558e3 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1
+++ b/usr.bin/make/tests/shell/meta/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2 b/usr.bin/make/tests/shell/meta/expected.stdout.2
index 6ac6f19..6ac6f19 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2
+++ b/usr.bin/make/tests/shell/meta/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/meta/test.t b/usr.bin/make/tests/shell/meta/legacy_test.sh
index 588b73c..41cd763 100644
--- a/tools/regression/usr.bin/make/shell/meta/test.t
+++ b/usr.bin/make/tests/shell/meta/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Check that a command line with meta characters is passed to the shell."
diff --git a/tools/regression/usr.bin/make/shell/meta/sh b/usr.bin/make/tests/shell/meta/sh
index 3a507b87..3a507b87 100644
--- a/tools/regression/usr.bin/make/shell/meta/sh
+++ b/usr.bin/make/tests/shell/meta/sh
diff --git a/usr.bin/make/tests/shell/path/Makefile b/usr.bin/make/tests/shell/path/Makefile
new file mode 100644
index 0000000..d1eb37a
--- /dev/null
+++ b/usr.bin/make/tests/shell/path/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		sh
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/shell/path/Makefile b/usr.bin/make/tests/shell/path/Makefile.test
index fe40b64..fe40b64 100644
--- a/tools/regression/usr.bin/make/shell/path/Makefile
+++ b/usr.bin/make/tests/shell/path/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.1 b/usr.bin/make/tests/shell/path/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.status.1
+++ b/usr.bin/make/tests/shell/path/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.2 b/usr.bin/make/tests/shell/path/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.status.2
+++ b/usr.bin/make/tests/shell/path/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.1 b/usr.bin/make/tests/shell/path/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.stderr.1
+++ b/usr.bin/make/tests/shell/path/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.2 b/usr.bin/make/tests/shell/path/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.stderr.2
+++ b/usr.bin/make/tests/shell/path/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.1 b/usr.bin/make/tests/shell/path/expected.stdout.1
index d881364..d881364 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.stdout.1
+++ b/usr.bin/make/tests/shell/path/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.2 b/usr.bin/make/tests/shell/path/expected.stdout.2
index de3fc89..de3fc89 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.stdout.2
+++ b/usr.bin/make/tests/shell/path/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/path/test.t b/usr.bin/make/tests/shell/path/legacy_test.sh
index 72ff252..9289a8d 100644
--- a/tools/regression/usr.bin/make/shell/path/test.t
+++ b/usr.bin/make/tests/shell/path/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="New path for builtin shells."
diff --git a/tools/regression/usr.bin/make/shell/path/sh b/usr.bin/make/tests/shell/path/sh
index 46169eb..46169eb 100644
--- a/tools/regression/usr.bin/make/shell/path/sh
+++ b/usr.bin/make/tests/shell/path/sh
diff --git a/usr.bin/make/tests/shell/path_select/Makefile b/usr.bin/make/tests/shell/path_select/Makefile
new file mode 100644
index 0000000..d9341b4
--- /dev/null
+++ b/usr.bin/make/tests/shell/path_select/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path_select
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		shell
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/shell/path_select/Makefile b/usr.bin/make/tests/shell/path_select/Makefile.test
index 05cfb27..05cfb27 100644
--- a/tools/regression/usr.bin/make/shell/path_select/Makefile
+++ b/usr.bin/make/tests/shell/path_select/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.1 b/usr.bin/make/tests/shell/path_select/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.status.1
+++ b/usr.bin/make/tests/shell/path_select/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.2 b/usr.bin/make/tests/shell/path_select/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.status.2
+++ b/usr.bin/make/tests/shell/path_select/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1 b/usr.bin/make/tests/shell/path_select/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1
+++ b/usr.bin/make/tests/shell/path_select/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2 b/usr.bin/make/tests/shell/path_select/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2
+++ b/usr.bin/make/tests/shell/path_select/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1 b/usr.bin/make/tests/shell/path_select/expected.stdout.1
index d881364..d881364 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1
+++ b/usr.bin/make/tests/shell/path_select/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2 b/usr.bin/make/tests/shell/path_select/expected.stdout.2
index de3fc89..de3fc89 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2
+++ b/usr.bin/make/tests/shell/path_select/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/path_select/test.t b/usr.bin/make/tests/shell/path_select/legacy_test.sh
index 5bac631..6b75b90 100644
--- a/tools/regression/usr.bin/make/shell/path_select/test.t
+++ b/usr.bin/make/tests/shell/path_select/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="New path for builtin shells (2)."
diff --git a/tools/regression/usr.bin/make/shell/path_select/shell b/usr.bin/make/tests/shell/path_select/shell
index 46169eb..46169eb 100644
--- a/tools/regression/usr.bin/make/shell/path_select/shell
+++ b/usr.bin/make/tests/shell/path_select/shell
diff --git a/usr.bin/make/tests/shell/replace/Makefile b/usr.bin/make/tests/shell/replace/Makefile
new file mode 100644
index 0000000..7c64d72
--- /dev/null
+++ b/usr.bin/make/tests/shell/replace/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/replace
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		shell
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/shell/replace/Makefile b/usr.bin/make/tests/shell/replace/Makefile.test
index 2160dbf..2160dbf 100644
--- a/tools/regression/usr.bin/make/shell/replace/Makefile
+++ b/usr.bin/make/tests/shell/replace/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.1 b/usr.bin/make/tests/shell/replace/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.status.1
+++ b/usr.bin/make/tests/shell/replace/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.2 b/usr.bin/make/tests/shell/replace/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.status.2
+++ b/usr.bin/make/tests/shell/replace/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1 b/usr.bin/make/tests/shell/replace/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1
+++ b/usr.bin/make/tests/shell/replace/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2 b/usr.bin/make/tests/shell/replace/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2
+++ b/usr.bin/make/tests/shell/replace/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1 b/usr.bin/make/tests/shell/replace/expected.stdout.1
index eff99ea..eff99ea 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1
+++ b/usr.bin/make/tests/shell/replace/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.2 b/usr.bin/make/tests/shell/replace/expected.stdout.2
index c79a09a..c79a09a 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stdout.2
+++ b/usr.bin/make/tests/shell/replace/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/replace/test.t b/usr.bin/make/tests/shell/replace/legacy_test.sh
index 5c91cf9..880ca78 100644
--- a/tools/regression/usr.bin/make/shell/replace/test.t
+++ b/usr.bin/make/tests/shell/replace/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Check that the shell can be replaced."
diff --git a/tools/regression/usr.bin/make/shell/replace/shell b/usr.bin/make/tests/shell/replace/shell
index 46169eb..46169eb 100644
--- a/tools/regression/usr.bin/make/shell/replace/shell
+++ b/usr.bin/make/tests/shell/replace/shell
diff --git a/usr.bin/make/tests/shell/select/Makefile b/usr.bin/make/tests/shell/select/Makefile
new file mode 100644
index 0000000..85486c6
--- /dev/null
+++ b/usr.bin/make/tests/shell/select/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/select
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/shell/select/Makefile b/usr.bin/make/tests/shell/select/Makefile.test
index e1ff023..74d96e1 100644
--- a/tools/regression/usr.bin/make/shell/select/Makefile
+++ b/usr.bin/make/tests/shell/select/Makefile.test
@@ -25,4 +25,4 @@ ksh_test: print_path
 .endif
 
 print_path:
-	@ps -opid,command | awk '$$1=='$$$$' { print $$2; }'
+	@ps -x -opid,command | awk '$$1=='$$$$' { print $$2; }'
diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.1 b/usr.bin/make/tests/shell/select/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.status.1
+++ b/usr.bin/make/tests/shell/select/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.2 b/usr.bin/make/tests/shell/select/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.status.2
+++ b/usr.bin/make/tests/shell/select/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.1 b/usr.bin/make/tests/shell/select/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stderr.1
+++ b/usr.bin/make/tests/shell/select/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.2 b/usr.bin/make/tests/shell/select/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stderr.2
+++ b/usr.bin/make/tests/shell/select/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.1 b/usr.bin/make/tests/shell/select/expected.stdout.1
index c2cdaa0..c2cdaa0 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stdout.1
+++ b/usr.bin/make/tests/shell/select/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.2 b/usr.bin/make/tests/shell/select/expected.stdout.2
index 5a831e8..5a831e8 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stdout.2
+++ b/usr.bin/make/tests/shell/select/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/select/test.t b/usr.bin/make/tests/shell/select/legacy_test.sh
index 7f73f9b..46d3eaf 100644
--- a/tools/regression/usr.bin/make/shell/select/test.t
+++ b/usr.bin/make/tests/shell/select/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Select the builtin sh shell."
diff --git a/usr.bin/make/tests/suffixes/Makefile b/usr.bin/make/tests/suffixes/Makefile
new file mode 100644
index 0000000..f15620d
--- /dev/null
+++ b/usr.bin/make/tests/suffixes/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes
+
+TESTS_SUBDIRS=	basic src_wild1 src_wild2
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/suffixes/basic/Makefile b/usr.bin/make/tests/suffixes/basic/Makefile
new file mode 100644
index 0000000..2bd3a78
--- /dev/null
+++ b/usr.bin/make/tests/suffixes/basic/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/basic
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		TEST1.a
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/suffixes/basic/Makefile b/usr.bin/make/tests/suffixes/basic/Makefile.test
index 45d9130..45d9130 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/Makefile
+++ b/usr.bin/make/tests/suffixes/basic/Makefile.test
diff --git a/tools/regression/usr.bin/make/suffixes/basic/TEST1.a b/usr.bin/make/tests/suffixes/basic/TEST1.a
index da5569b..da5569b 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/TEST1.a
+++ b/usr.bin/make/tests/suffixes/basic/TEST1.a
diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.status.1 b/usr.bin/make/tests/suffixes/basic/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/expected.status.1
+++ b/usr.bin/make/tests/suffixes/basic/expected.status.1
diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1 b/usr.bin/make/tests/suffixes/basic/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1
+++ b/usr.bin/make/tests/suffixes/basic/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1 b/usr.bin/make/tests/suffixes/basic/expected.stdout.1
index 582927e..582927e 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1
+++ b/usr.bin/make/tests/suffixes/basic/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/suffixes/basic/test.t b/usr.bin/make/tests/suffixes/basic/legacy_test.sh
index 0b387c8..3446bf0 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/test.t
+++ b/usr.bin/make/tests/suffixes/basic/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Basic suffix operation."
diff --git a/usr.bin/make/tests/suffixes/src_wild1/Makefile b/usr.bin/make/tests/suffixes/src_wild1/Makefile
new file mode 100644
index 0000000..e10e8e8
--- /dev/null
+++ b/usr.bin/make/tests/suffixes/src_wild1/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		TEST1.a
+FILES+=		TEST2.a
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile b/usr.bin/make/tests/suffixes/src_wild1/Makefile.test
index d0258ad..d0258ad 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile
+++ b/usr.bin/make/tests/suffixes/src_wild1/Makefile.test
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a b/usr.bin/make/tests/suffixes/src_wild1/TEST1.a
index da5569b..da5569b 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a
+++ b/usr.bin/make/tests/suffixes/src_wild1/TEST1.a
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a b/usr.bin/make/tests/suffixes/src_wild1/TEST2.a
index 34f8508..34f8508 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a
+++ b/usr.bin/make/tests/suffixes/src_wild1/TEST2.a
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1 b/usr.bin/make/tests/suffixes/src_wild1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1
+++ b/usr.bin/make/tests/suffixes/src_wild1/expected.status.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1 b/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1
+++ b/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1 b/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1
index 3cd2129..3cd2129 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1
+++ b/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t b/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh
index 6b31118..053cc6c 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t
+++ b/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Source wildcard expansion."
diff --git a/usr.bin/make/tests/suffixes/src_wild2/Makefile b/usr.bin/make/tests/suffixes/src_wild2/Makefile
new file mode 100644
index 0000000..a474bae
--- /dev/null
+++ b/usr.bin/make/tests/suffixes/src_wild2/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild2
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		TEST1.a
+FILES+=		TEST2.a
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile b/usr.bin/make/tests/suffixes/src_wild2/Makefile.test
index 1dea7ea..1dea7ea 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile
+++ b/usr.bin/make/tests/suffixes/src_wild2/Makefile.test
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a b/usr.bin/make/tests/suffixes/src_wild2/TEST1.a
index da5569b..da5569b 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a
+++ b/usr.bin/make/tests/suffixes/src_wild2/TEST1.a
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a b/usr.bin/make/tests/suffixes/src_wild2/TEST2.a
index 34f8508..34f8508 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a
+++ b/usr.bin/make/tests/suffixes/src_wild2/TEST2.a
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1 b/usr.bin/make/tests/suffixes/src_wild2/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1
+++ b/usr.bin/make/tests/suffixes/src_wild2/expected.status.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1 b/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1
+++ b/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1 b/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1
index 3cd2129..3cd2129 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1
+++ b/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t b/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh
index 0d40e3d..03cff93 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t
+++ b/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Source wildcard expansion (2)."
diff --git a/usr.bin/make/tests/syntax/Makefile b/usr.bin/make/tests/syntax/Makefile
new file mode 100644
index 0000000..80f1846
--- /dev/null
+++ b/usr.bin/make/tests/syntax/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax
+
+TESTS_SUBDIRS=	directive-t0 enl funny-targets semi
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/syntax/directive-t0/Makefile b/usr.bin/make/tests/syntax/directive-t0/Makefile
new file mode 100644
index 0000000..6d557e2
--- /dev/null
+++ b/usr.bin/make/tests/syntax/directive-t0/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/directive-t0
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/Makefile b/usr.bin/make/tests/syntax/directive-t0/Makefile.test
index 0f95a21..0f95a21 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/Makefile
+++ b/usr.bin/make/tests/syntax/directive-t0/Makefile.test
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1 b/usr.bin/make/tests/syntax/directive-t0/expected.status.1
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1
+++ b/usr.bin/make/tests/syntax/directive-t0/expected.status.1
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1 b/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1
index de66fcc..de66fcc 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1
+++ b/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1 b/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1
+++ b/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/test.t b/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh
index 4b71de3..451c876 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/test.t
+++ b/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh
@@ -1,8 +1,7 @@
 #! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="A typo'ed directive."
diff --git a/usr.bin/make/tests/syntax/enl/Makefile b/usr.bin/make/tests/syntax/enl/Makefile
new file mode 100644
index 0000000..362962c
--- /dev/null
+++ b/usr.bin/make/tests/syntax/enl/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/enl
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/syntax/enl/Makefile b/usr.bin/make/tests/syntax/enl/Makefile.test
index a7c6955..a7c6955 100644
--- a/tools/regression/usr.bin/make/syntax/enl/Makefile
+++ b/usr.bin/make/tests/syntax/enl/Makefile.test
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.1 b/usr.bin/make/tests/syntax/enl/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.1
+++ b/usr.bin/make/tests/syntax/enl/expected.status.1
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.2 b/usr.bin/make/tests/syntax/enl/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.2
+++ b/usr.bin/make/tests/syntax/enl/expected.status.2
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.3 b/usr.bin/make/tests/syntax/enl/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.3
+++ b/usr.bin/make/tests/syntax/enl/expected.status.3
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.4 b/usr.bin/make/tests/syntax/enl/expected.status.4
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.4
+++ b/usr.bin/make/tests/syntax/enl/expected.status.4
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.5 b/usr.bin/make/tests/syntax/enl/expected.status.5
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.5
+++ b/usr.bin/make/tests/syntax/enl/expected.status.5
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1 b/usr.bin/make/tests/syntax/enl/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2 b/usr.bin/make/tests/syntax/enl/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3 b/usr.bin/make/tests/syntax/enl/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4 b/usr.bin/make/tests/syntax/enl/expected.stderr.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.4
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5 b/usr.bin/make/tests/syntax/enl/expected.stderr.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.5
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1 b/usr.bin/make/tests/syntax/enl/expected.stdout.1
index 9766475..9766475 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2 b/usr.bin/make/tests/syntax/enl/expected.stdout.2
index 9766475..9766475 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3 b/usr.bin/make/tests/syntax/enl/expected.stdout.3
index 422c2b7..422c2b7 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4 b/usr.bin/make/tests/syntax/enl/expected.stdout.4
index b2901ea..b2901ea 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.4
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5 b/usr.bin/make/tests/syntax/enl/expected.stdout.5
index 5120076..5120076 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.5
diff --git a/tools/regression/usr.bin/make/syntax/enl/test.t b/usr.bin/make/tests/syntax/enl/legacy_test.sh
index 2e5d12c..307c1f0 100644
--- a/tools/regression/usr.bin/make/syntax/enl/test.t
+++ b/usr.bin/make/tests/syntax/enl/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Test escaped new-lines handling."
diff --git a/usr.bin/make/tests/syntax/funny-targets/Makefile b/usr.bin/make/tests/syntax/funny-targets/Makefile
new file mode 100644
index 0000000..07b1f75
--- /dev/null
+++ b/usr.bin/make/tests/syntax/funny-targets/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/funny-targets
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/Makefile b/usr.bin/make/tests/syntax/funny-targets/Makefile.test
index 064ab3a..064ab3a 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/Makefile
+++ b/usr.bin/make/tests/syntax/funny-targets/Makefile.test
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 b/usr.bin/make/tests/syntax/funny-targets/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.status.1
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 b/usr.bin/make/tests/syntax/funny-targets/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.status.2
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1
index 09cb232..09cb232 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2
index b2f0364..b2f0364 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/test.t b/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh
index ec7e75c..e9cd317 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/test.t
+++ b/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC='Target names with "funny" embeded characters.'
diff --git a/usr.bin/make/tests/syntax/semi/Makefile b/usr.bin/make/tests/syntax/semi/Makefile
new file mode 100644
index 0000000..703683d
--- /dev/null
+++ b/usr.bin/make/tests/syntax/semi/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/semi
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/syntax/semi/Makefile b/usr.bin/make/tests/syntax/semi/Makefile.test
index 12f5225..12f5225 100644
--- a/tools/regression/usr.bin/make/syntax/semi/Makefile
+++ b/usr.bin/make/tests/syntax/semi/Makefile.test
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.status.1 b/usr.bin/make/tests/syntax/semi/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.status.1
+++ b/usr.bin/make/tests/syntax/semi/expected.status.1
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.status.2 b/usr.bin/make/tests/syntax/semi/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.status.2
+++ b/usr.bin/make/tests/syntax/semi/expected.status.2
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1 b/usr.bin/make/tests/syntax/semi/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1
+++ b/usr.bin/make/tests/syntax/semi/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2 b/usr.bin/make/tests/syntax/semi/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2
+++ b/usr.bin/make/tests/syntax/semi/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1 b/usr.bin/make/tests/syntax/semi/expected.stdout.1
index 12b9617..12b9617 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1
+++ b/usr.bin/make/tests/syntax/semi/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2 b/usr.bin/make/tests/syntax/semi/expected.stdout.2
index be0fa55..be0fa55 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2
+++ b/usr.bin/make/tests/syntax/semi/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/syntax/semi/test.t b/usr.bin/make/tests/syntax/semi/legacy_test.sh
index f52c9ab..092635a 100644
--- a/tools/regression/usr.bin/make/syntax/semi/test.t
+++ b/usr.bin/make/tests/syntax/semi/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Test semicolon handling."
diff --git a/usr.bin/make/tests/sysmk/Makefile b/usr.bin/make/tests/sysmk/Makefile
new file mode 100644
index 0000000..7b7b981
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk
+
+TESTS_SUBDIRS=	t0 t1 t2
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/Makefile b/usr.bin/make/tests/sysmk/t0/2/1/Makefile
new file mode 100644
index 0000000..2c732f5
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t0/2/1/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2/1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile b/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test
index fc95f46..fc95f46 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile
+++ b/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1 b/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1
+++ b/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1 b/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
+++ b/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1 b/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1
index 6f29307..6f29307 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
+++ b/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t b/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh
index 9a78157..0214842 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t
+++ b/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../../../common.sh
+. $(dirname $0)/../../../../common.sh
 
 # Description
 DESC="Can we traverse up to / and find a 'mk/sys.mk'?"
diff --git a/usr.bin/make/tests/sysmk/t0/2/Makefile b/usr.bin/make/tests/sysmk/t0/2/Makefile
new file mode 100644
index 0000000..ecd79b3
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t0/2/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2
+
+TESTS_SUBDIRS=	1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t0/Makefile b/usr.bin/make/tests/sysmk/t0/Makefile
new file mode 100644
index 0000000..2777925
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t0/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0
+
+TESTS_SUBDIRS=	2
+SUBDIR=		mk
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t0/mk/Makefile b/usr.bin/make/tests/sysmk/t0/mk/Makefile
new file mode 100644
index 0000000..047b9de
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t0/mk/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/mk
+
+FILESDIR=		${TESTSDIR}
+FILES=			sys.mk.test
+FILESNAME_sys.mk.test=	sys.mk
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk b/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test
index 60f1955..60f1955 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk
+++ b/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/Makefile b/usr.bin/make/tests/sysmk/t1/2/1/Makefile
new file mode 100644
index 0000000..aa93766
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t1/2/1/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2/1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		cleanup
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup b/usr.bin/make/tests/sysmk/t1/2/1/cleanup
index c3d58b7..c3d58b7 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup
+++ b/usr.bin/make/tests/sysmk/t1/2/1/cleanup
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1 b/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1
+++ b/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1 b/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
+++ b/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1 b/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1
index 6f29307..6f29307 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
+++ b/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t b/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh
index ad1584f..fb73851 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t
+++ b/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../../../common.sh
+. $(dirname $0)/../../../../common.sh
 
 # Description
 DESC="Can we traverse up to / and find a 'mk/sys.mk' with -C -m?"
@@ -12,7 +10,7 @@ DESC="Can we traverse up to / and find a 'mk/sys.mk' with -C -m?"
 TEST_N=1
 TEST_1="-C ../../../t0/2/1 -m .../mk"
 TEST_MAKE_DIRS="../../mk 755 ../../../t0/mk 755 ../../../t0/2/1 755"
-TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile 644"
+TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile.test 644"
 TEST_CLEAN_FILES="../../../t0/2/1"
 TEST_CLEANUP=clean-special
 
diff --git a/usr.bin/make/tests/sysmk/t1/2/Makefile b/usr.bin/make/tests/sysmk/t1/2/Makefile
new file mode 100644
index 0000000..3e5d82c
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t1/2/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2
+
+TESTS_SUBDIRS=	1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t1/Makefile b/usr.bin/make/tests/sysmk/t1/Makefile
new file mode 100644
index 0000000..d8a2c06
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t1/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1
+
+TESTS_SUBDIRS=	2
+SUBDIR=		mk
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t1/mk/Makefile b/usr.bin/make/tests/sysmk/t1/mk/Makefile
new file mode 100644
index 0000000..da052af
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t1/mk/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/mk
+
+FILESDIR=		${TESTSDIR}
+FILES=			sys.mk.test
+FILESNAME_sys.mk.test=	sys.mk
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk b/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test
index 99b8ecc..99b8ecc 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk
+++ b/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/Makefile b/usr.bin/make/tests/sysmk/t2/2/1/Makefile
new file mode 100644
index 0000000..52fdd8d
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t2/2/1/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2/1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		cleanup
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup b/usr.bin/make/tests/sysmk/t2/2/1/cleanup
index c3d58b7..c3d58b7 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup
+++ b/usr.bin/make/tests/sysmk/t2/2/1/cleanup
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1 b/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1
+++ b/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1 b/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
+++ b/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1 b/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1
index 70f1be3..70f1be3 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
+++ b/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t b/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh
index 2c4dff3..ca817d8 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t
+++ b/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../../../common.sh
+. $(dirname $0)/../../../../common.sh
 
 # Description
 DESC="Can we traverse up to / and find a 'mk/sys.mk' with -m -C?"
@@ -12,7 +10,7 @@ DESC="Can we traverse up to / and find a 'mk/sys.mk' with -m -C?"
 TEST_N=1
 TEST_1="-m .../mk -C ../../../t0/2/1"
 TEST_MAKE_DIRS="../../mk 755 ../../../t0/mk 755 ../../../t0/2/1 755"
-TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile 644"
+TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile.test 644"
 TEST_CLEAN_FILES="../../../t0/2/1"
 TEST_CLEANUP=clean-special
 
diff --git a/usr.bin/make/tests/sysmk/t2/2/Makefile b/usr.bin/make/tests/sysmk/t2/2/Makefile
new file mode 100644
index 0000000..3dd84f0
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t2/2/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2
+
+TESTS_SUBDIRS=	1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t2/Makefile b/usr.bin/make/tests/sysmk/t2/Makefile
new file mode 100644
index 0000000..3f95a85
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t2/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2
+
+TESTS_SUBDIRS=	2
+SUBDIR=		mk
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t2/mk/Makefile b/usr.bin/make/tests/sysmk/t2/mk/Makefile
new file mode 100644
index 0000000..5fdb1ac
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t2/mk/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/mk
+
+FILESDIR=		${TESTSDIR}
+FILES=			sys.mk.test
+FILESNAME_sys.mk.test=	sys.mk
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk b/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test
index 55632fd..55632fd 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk
+++ b/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test
diff --git a/tools/regression/usr.bin/make/test-new.mk b/usr.bin/make/tests/test-new.mk
index f200833..f200833 100644
--- a/tools/regression/usr.bin/make/test-new.mk
+++ b/usr.bin/make/tests/test-new.mk
diff --git a/usr.bin/make/tests/variables/Makefile b/usr.bin/make/tests/variables/Makefile
new file mode 100644
index 0000000..9f328a8
--- /dev/null
+++ b/usr.bin/make/tests/variables/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables
+
+TESTS_SUBDIRS=	modifier_M modifier_t opt_V t0
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/modifier_M/Makefile b/usr.bin/make/tests/variables/modifier_M/Makefile
new file mode 100644
index 0000000..59cb0bc
--- /dev/null
+++ b/usr.bin/make/tests/variables/modifier_M/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_M
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/Makefile b/usr.bin/make/tests/variables/modifier_M/Makefile.test
index 34d4cd4..34d4cd4 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/Makefile
+++ b/usr.bin/make/tests/variables/modifier_M/Makefile.test
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1 b/usr.bin/make/tests/variables/modifier_M/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1
+++ b/usr.bin/make/tests/variables/modifier_M/expected.status.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1 b/usr.bin/make/tests/variables/modifier_M/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1
+++ b/usr.bin/make/tests/variables/modifier_M/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1 b/usr.bin/make/tests/variables/modifier_M/expected.stdout.1
index b29e6df..b29e6df 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1
+++ b/usr.bin/make/tests/variables/modifier_M/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/test.t b/usr.bin/make/tests/variables/modifier_M/legacy_test.sh
index 979778f..6a3e68f 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/test.t
+++ b/usr.bin/make/tests/variables/modifier_M/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Variable expansion with M modifier"
diff --git a/usr.bin/make/tests/variables/modifier_t/Makefile b/usr.bin/make/tests/variables/modifier_t/Makefile
new file mode 100644
index 0000000..4b5bfee
--- /dev/null
+++ b/usr.bin/make/tests/variables/modifier_t/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_t
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/Makefile b/usr.bin/make/tests/variables/modifier_t/Makefile.test
index 53844ee..53844ee 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/Makefile
+++ b/usr.bin/make/tests/variables/modifier_t/Makefile.test
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.1 b/usr.bin/make/tests/variables/modifier_t/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.1
+++ b/usr.bin/make/tests/variables/modifier_t/expected.status.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.2 b/usr.bin/make/tests/variables/modifier_t/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.2
+++ b/usr.bin/make/tests/variables/modifier_t/expected.status.2
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.3 b/usr.bin/make/tests/variables/modifier_t/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.3
+++ b/usr.bin/make/tests/variables/modifier_t/expected.status.3
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1 b/usr.bin/make/tests/variables/modifier_t/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2 b/usr.bin/make/tests/variables/modifier_t/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3 b/usr.bin/make/tests/variables/modifier_t/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1 b/usr.bin/make/tests/variables/modifier_t/expected.stdout.1
index dff38fd..dff38fd 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2 b/usr.bin/make/tests/variables/modifier_t/expected.stdout.2
index 71a0f60..71a0f60 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3 b/usr.bin/make/tests/variables/modifier_t/expected.stdout.3
index 6434c7b..6434c7b 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/test.t b/usr.bin/make/tests/variables/modifier_t/legacy_test.sh
index f564f6e..7f14571 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/test.t
+++ b/usr.bin/make/tests/variables/modifier_t/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Variable expansion with t modifiers"
diff --git a/usr.bin/make/tests/variables/opt_V/Makefile b/usr.bin/make/tests/variables/opt_V/Makefile
new file mode 100644
index 0000000..0c3bf17
--- /dev/null
+++ b/usr.bin/make/tests/variables/opt_V/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/opt_V
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/variables/opt_V/Makefile b/usr.bin/make/tests/variables/opt_V/Makefile.test
index 128e511..128e511 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/Makefile
+++ b/usr.bin/make/tests/variables/opt_V/Makefile.test
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.status.1 b/usr.bin/make/tests/variables/opt_V/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.status.1
+++ b/usr.bin/make/tests/variables/opt_V/expected.status.1
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.status.2 b/usr.bin/make/tests/variables/opt_V/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.status.2
+++ b/usr.bin/make/tests/variables/opt_V/expected.status.2
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1 b/usr.bin/make/tests/variables/opt_V/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1
+++ b/usr.bin/make/tests/variables/opt_V/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2 b/usr.bin/make/tests/variables/opt_V/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2
+++ b/usr.bin/make/tests/variables/opt_V/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1 b/usr.bin/make/tests/variables/opt_V/expected.stdout.1
index 050db40..050db40 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1
+++ b/usr.bin/make/tests/variables/opt_V/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2 b/usr.bin/make/tests/variables/opt_V/expected.stdout.2
index 4da2aef..4da2aef 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2
+++ b/usr.bin/make/tests/variables/opt_V/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/variables/opt_V/test.t b/usr.bin/make/tests/variables/opt_V/legacy_test.sh
index 32a74b6..4b1122a 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/test.t
+++ b/usr.bin/make/tests/variables/opt_V/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Variable expansion using command line '-V'"
diff --git a/usr.bin/make/tests/variables/t0/Makefile b/usr.bin/make/tests/variables/t0/Makefile
new file mode 100644
index 0000000..06e1179
--- /dev/null
+++ b/usr.bin/make/tests/variables/t0/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/t0
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/make/variables/t0/Makefile b/usr.bin/make/tests/variables/t0/Makefile.test
index 1cc58ee..1cc58ee 100644
--- a/tools/regression/usr.bin/make/variables/t0/Makefile
+++ b/usr.bin/make/tests/variables/t0/Makefile.test
diff --git a/tools/regression/usr.bin/make/variables/t0/expected.status.1 b/usr.bin/make/tests/variables/t0/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/t0/expected.status.1
+++ b/usr.bin/make/tests/variables/t0/expected.status.1
diff --git a/tools/regression/usr.bin/make/variables/t0/expected.stderr.1 b/usr.bin/make/tests/variables/t0/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/t0/expected.stderr.1
+++ b/usr.bin/make/tests/variables/t0/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/variables/t0/expected.stdout.1 b/usr.bin/make/tests/variables/t0/expected.stdout.1
index e2c70de..e2c70de 100644
--- a/tools/regression/usr.bin/make/variables/t0/expected.stdout.1
+++ b/usr.bin/make/tests/variables/t0/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/variables/t0/test.t b/usr.bin/make/tests/variables/t0/legacy_test.sh
index 7e4f427..8c78e2d 100644
--- a/tools/regression/usr.bin/make/variables/t0/test.t
+++ b/usr.bin/make/tests/variables/t0/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Variable expansion."
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 7d42921..27aa567 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	ncal
 
 DPADD=	${LIBCALENDAR} ${LIBTERMCAP}
@@ -8,4 +10,8 @@ LDADD=	-lcalendar -ltermcap
 LINKS=	${BINDIR}/ncal ${BINDIR}/cal
 MLINKS=	ncal.1 cal.1
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/ncal/tests/Makefile b/usr.bin/ncal/tests/Makefile
new file mode 100644
index 0000000..170caac
--- /dev/null
+++ b/usr.bin/ncal/tests/Makefile
@@ -0,0 +1,99 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/ncal
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.b-3m200901-jd-nhl.out
+FILES+=		regress.b-3m200901-md-nhl.out
+FILES+=		regress.b-3m200902-jd-nhl.out
+FILES+=		regress.b-3m200902-md-nhl.out
+FILES+=		regress.b-3m200903-jd-nhl.out
+FILES+=		regress.b-3m200903-md-nhl.out
+FILES+=		regress.b-3m200904-jd-nhl.out
+FILES+=		regress.b-3m200904-md-nhl.out
+FILES+=		regress.b-3m200905-jd-nhl.out
+FILES+=		regress.b-3m200905-md-nhl.out
+FILES+=		regress.b-3m200906-jd-nhl.out
+FILES+=		regress.b-3m200906-md-nhl.out
+FILES+=		regress.b-3m200907-jd-nhl.out
+FILES+=		regress.b-3m200907-md-nhl.out
+FILES+=		regress.b-3m200908-jd-nhl.out
+FILES+=		regress.b-3m200908-md-nhl.out
+FILES+=		regress.b-3m200909-jd-nhl.out
+FILES+=		regress.b-3m200909-md-nhl.out
+FILES+=		regress.b-3m200910-jd-nhl.out
+FILES+=		regress.b-3m200910-md-nhl.out
+FILES+=		regress.b-3m200911-jd-nhl.out
+FILES+=		regress.b-3m200911-md-nhl.out
+FILES+=		regress.b-3m200912-jd-nhl.out
+FILES+=		regress.b-3m200912-md-nhl.out
+FILES+=		regress.b-y2008-jd-nhl.out
+FILES+=		regress.b-y2008-md-nhl.out
+FILES+=		regress.b-y2009-jd-nhl.out
+FILES+=		regress.b-y2009-md-nhl.out
+FILES+=		regress.b-y2010-jd-nhl.out
+FILES+=		regress.b-y2010-md-nhl.out
+FILES+=		regress.b-y2011-jd-nhl.out
+FILES+=		regress.b-y2011-md-nhl.out
+FILES+=		regress.f-3A-nhl.out
+FILES+=		regress.f-3AB-nhl.out
+FILES+=		regress.f-3B-nhl.out
+FILES+=		regress.f-3gy-nhl.out
+FILES+=		regress.f-3y-nhl.out
+FILES+=		regress.f-mgm-nhl.out
+FILES+=		regress.f-yA-nhl.out
+FILES+=		regress.f-yAB-nhl.out
+FILES+=		regress.f-yB-nhl.out
+FILES+=		regress.f-ygm-nhl.out
+FILES+=		regress.f-ym-nhl.out
+FILES+=		regress.r-3m200901-jd-nhl.out
+FILES+=		regress.r-3m200901-md-nhl.out
+FILES+=		regress.r-3m200902-jd-nhl.out
+FILES+=		regress.r-3m200902-md-nhl.out
+FILES+=		regress.r-3m200903-jd-nhl.out
+FILES+=		regress.r-3m200903-md-nhl.out
+FILES+=		regress.r-3m200904-jd-nhl.out
+FILES+=		regress.r-3m200904-md-nhl.out
+FILES+=		regress.r-3m200905-jd-nhl.out
+FILES+=		regress.r-3m200905-md-nhl.out
+FILES+=		regress.r-3m200906-jd-nhl.out
+FILES+=		regress.r-3m200906-md-nhl.out
+FILES+=		regress.r-3m200907-jd-nhl.out
+FILES+=		regress.r-3m200907-md-nhl.out
+FILES+=		regress.r-3m200908-jd-nhl.out
+FILES+=		regress.r-3m200908-md-nhl.out
+FILES+=		regress.r-3m200909-jd-nhl.out
+FILES+=		regress.r-3m200909-md-nhl.out
+FILES+=		regress.r-3m200910-jd-nhl.out
+FILES+=		regress.r-3m200910-md-nhl.out
+FILES+=		regress.r-3m200911-jd-nhl.out
+FILES+=		regress.r-3m200911-md-nhl.out
+FILES+=		regress.r-3m200912-jd-nhl.out
+FILES+=		regress.r-3m200912-md-nhl.out
+FILES+=		regress.r-y2008-jd-nhl.out
+FILES+=		regress.r-y2008-md-nhl.out
+FILES+=		regress.r-y2009-jd-nhl.out
+FILES+=		regress.r-y2009-md-nhl.out
+FILES+=		regress.r-y2010-jd-nhl.out
+FILES+=		regress.r-y2010-md-nhl.out
+FILES+=		regress.r-y2011-jd-nhl.out
+FILES+=		regress.r-y2011-md-nhl.out
+FILES+=		regress.s-b-3-nhl.out
+FILES+=		regress.s-b-A-nhl.out
+FILES+=		regress.s-b-AB-nhl.out
+FILES+=		regress.s-b-B-nhl.out
+FILES+=		regress.s-b-gmgy-nhl.out
+FILES+=		regress.s-b-m-nhl.out
+FILES+=		regress.s-b-mgy-nhl.out
+FILES+=		regress.s-r-3-nhl.out
+FILES+=		regress.s-r-A-nhl.out
+FILES+=		regress.s-r-AB-nhl.out
+FILES+=		regress.s-r-B-nhl.out
+FILES+=		regress.s-r-gmgy-nhl.out
+FILES+=		regress.s-r-m-nhl.out
+FILES+=		regress.s-r-mgy-nhl.out
+FILES+=		regress.sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/ncal/tests/legacy_test.sh b/usr.bin/ncal/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/ncal/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200901-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200901-jd-nhl.out
index 65d3619..65d3619 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200901-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200901-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200901-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200901-md-nhl.out
index afbdde1..afbdde1 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200901-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200901-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200902-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200902-jd-nhl.out
index 33f614d..33f614d 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200902-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200902-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200902-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200902-md-nhl.out
index e81b78e..e81b78e 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200902-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200902-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200903-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200903-jd-nhl.out
index 5974cbf..5974cbf 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200903-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200903-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200903-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200903-md-nhl.out
index 4e9f0eb..4e9f0eb 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200903-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200903-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200904-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200904-jd-nhl.out
index d559f32..d559f32 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200904-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200904-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200904-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200904-md-nhl.out
index 0df9a75..0df9a75 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200904-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200904-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200905-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200905-jd-nhl.out
index 35d9c2b..35d9c2b 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200905-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200905-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200905-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200905-md-nhl.out
index 3ee495d..3ee495d 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200905-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200905-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200906-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200906-jd-nhl.out
index 47f95b0..47f95b0 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200906-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200906-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200906-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200906-md-nhl.out
index a6c1dcd..a6c1dcd 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200906-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200906-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200907-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200907-jd-nhl.out
index 9d96208..9d96208 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200907-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200907-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200907-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200907-md-nhl.out
index 9b762e2..9b762e2 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200907-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200907-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200908-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200908-jd-nhl.out
index 768de3f..768de3f 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200908-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200908-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200908-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200908-md-nhl.out
index 339870e..339870e 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200908-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200908-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200909-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200909-jd-nhl.out
index befa00d..befa00d 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200909-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200909-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200909-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200909-md-nhl.out
index 4fb2714..4fb2714 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200909-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200909-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200910-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200910-jd-nhl.out
index 0a29593..0a29593 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200910-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200910-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200910-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200910-md-nhl.out
index 29cd67e..29cd67e 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200910-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200910-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200911-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200911-jd-nhl.out
index 4969cbc..4969cbc 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200911-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200911-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200911-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200911-md-nhl.out
index b1f57ff..b1f57ff 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200911-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200911-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200912-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200912-jd-nhl.out
index 61480a5..61480a5 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200912-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200912-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-3m200912-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200912-md-nhl.out
index fd4d220..fd4d220 100644
--- a/tools/regression/usr.bin/ncal/regress.b-3m200912-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-3m200912-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-y2008-jd-nhl.out b/usr.bin/ncal/tests/regress.b-y2008-jd-nhl.out
index cd423db..cd423db 100644
--- a/tools/regression/usr.bin/ncal/regress.b-y2008-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-y2008-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-y2008-md-nhl.out b/usr.bin/ncal/tests/regress.b-y2008-md-nhl.out
index dcd96fc..dcd96fc 100644
--- a/tools/regression/usr.bin/ncal/regress.b-y2008-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-y2008-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-y2009-jd-nhl.out b/usr.bin/ncal/tests/regress.b-y2009-jd-nhl.out
index db22d05..db22d05 100644
--- a/tools/regression/usr.bin/ncal/regress.b-y2009-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-y2009-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-y2009-md-nhl.out b/usr.bin/ncal/tests/regress.b-y2009-md-nhl.out
index c9f084e..c9f084e 100644
--- a/tools/regression/usr.bin/ncal/regress.b-y2009-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-y2009-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-y2010-jd-nhl.out b/usr.bin/ncal/tests/regress.b-y2010-jd-nhl.out
index d7ad9fc..d7ad9fc 100644
--- a/tools/regression/usr.bin/ncal/regress.b-y2010-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-y2010-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-y2010-md-nhl.out b/usr.bin/ncal/tests/regress.b-y2010-md-nhl.out
index 1d8a410..1d8a410 100644
--- a/tools/regression/usr.bin/ncal/regress.b-y2010-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-y2010-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-y2011-jd-nhl.out b/usr.bin/ncal/tests/regress.b-y2011-jd-nhl.out
index 31abb4e..31abb4e 100644
--- a/tools/regression/usr.bin/ncal/regress.b-y2011-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-y2011-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.b-y2011-md-nhl.out b/usr.bin/ncal/tests/regress.b-y2011-md-nhl.out
index d76a44f..d76a44f 100644
--- a/tools/regression/usr.bin/ncal/regress.b-y2011-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.b-y2011-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-3A-nhl.out b/usr.bin/ncal/tests/regress.f-3A-nhl.out
index e7f5e91..e7f5e91 100644
--- a/tools/regression/usr.bin/ncal/regress.f-3A-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-3A-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-3AB-nhl.out b/usr.bin/ncal/tests/regress.f-3AB-nhl.out
index e7f5e91..e7f5e91 100644
--- a/tools/regression/usr.bin/ncal/regress.f-3AB-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-3AB-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-3B-nhl.out b/usr.bin/ncal/tests/regress.f-3B-nhl.out
index e7f5e91..e7f5e91 100644
--- a/tools/regression/usr.bin/ncal/regress.f-3B-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-3B-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-3gy-nhl.out b/usr.bin/ncal/tests/regress.f-3gy-nhl.out
index 018646f..018646f 100644
--- a/tools/regression/usr.bin/ncal/regress.f-3gy-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-3gy-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-3y-nhl.out b/usr.bin/ncal/tests/regress.f-3y-nhl.out
index 5b2e000..5b2e000 100644
--- a/tools/regression/usr.bin/ncal/regress.f-3y-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-3y-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-mgm-nhl.out b/usr.bin/ncal/tests/regress.f-mgm-nhl.out
index 5f6c2eb..5f6c2eb 100644
--- a/tools/regression/usr.bin/ncal/regress.f-mgm-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-mgm-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-yA-nhl.out b/usr.bin/ncal/tests/regress.f-yA-nhl.out
index ce39ae7..ce39ae7 100644
--- a/tools/regression/usr.bin/ncal/regress.f-yA-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-yA-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-yAB-nhl.out b/usr.bin/ncal/tests/regress.f-yAB-nhl.out
index ce39ae7..ce39ae7 100644
--- a/tools/regression/usr.bin/ncal/regress.f-yAB-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-yAB-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-yB-nhl.out b/usr.bin/ncal/tests/regress.f-yB-nhl.out
index ce39ae7..ce39ae7 100644
--- a/tools/regression/usr.bin/ncal/regress.f-yB-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-yB-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-ygm-nhl.out b/usr.bin/ncal/tests/regress.f-ygm-nhl.out
index 6f898eb..6f898eb 100644
--- a/tools/regression/usr.bin/ncal/regress.f-ygm-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-ygm-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.f-ym-nhl.out b/usr.bin/ncal/tests/regress.f-ym-nhl.out
index 1921d92..1921d92 100644
--- a/tools/regression/usr.bin/ncal/regress.f-ym-nhl.out
+++ b/usr.bin/ncal/tests/regress.f-ym-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200901-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200901-jd-nhl.out
index 26ef49b..26ef49b 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200901-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200901-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200901-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200901-md-nhl.out
index d197fd3..d197fd3 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200901-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200901-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200902-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200902-jd-nhl.out
index cd84869..cd84869 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200902-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200902-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200902-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200902-md-nhl.out
index 20c35f1..20c35f1 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200902-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200902-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200903-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200903-jd-nhl.out
index 1ca28e0..1ca28e0 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200903-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200903-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200903-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200903-md-nhl.out
index 19fc969..19fc969 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200903-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200903-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200904-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200904-jd-nhl.out
index 8b8e77a..8b8e77a 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200904-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200904-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200904-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200904-md-nhl.out
index 449127c..449127c 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200904-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200904-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200905-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200905-jd-nhl.out
index 9054a1f..9054a1f 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200905-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200905-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200905-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200905-md-nhl.out
index 4a6a635..4a6a635 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200905-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200905-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200906-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200906-jd-nhl.out
index 6eb35eb..6eb35eb 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200906-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200906-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200906-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200906-md-nhl.out
index 53f1274..53f1274 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200906-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200906-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200907-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200907-jd-nhl.out
index 8c5701a..8c5701a 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200907-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200907-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200907-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200907-md-nhl.out
index f07ea0a..f07ea0a 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200907-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200907-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200908-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200908-jd-nhl.out
index 9d50894..9d50894 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200908-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200908-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200908-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200908-md-nhl.out
index e4822eb..e4822eb 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200908-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200908-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200909-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200909-jd-nhl.out
index 3bccbf5..3bccbf5 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200909-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200909-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200909-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200909-md-nhl.out
index 0c77c2d..0c77c2d 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200909-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200909-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200910-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200910-jd-nhl.out
index f5598e1..f5598e1 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200910-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200910-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200910-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200910-md-nhl.out
index 18561d2..18561d2 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200910-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200910-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200911-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200911-jd-nhl.out
index 4b8d1db..4b8d1db 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200911-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200911-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200911-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200911-md-nhl.out
index 35f1371..35f1371 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200911-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200911-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200912-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200912-jd-nhl.out
index 66efa29..66efa29 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200912-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200912-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-3m200912-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200912-md-nhl.out
index c62332a..c62332a 100644
--- a/tools/regression/usr.bin/ncal/regress.r-3m200912-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-3m200912-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-y2008-jd-nhl.out b/usr.bin/ncal/tests/regress.r-y2008-jd-nhl.out
index 0ea30ae..0ea30ae 100644
--- a/tools/regression/usr.bin/ncal/regress.r-y2008-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-y2008-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-y2008-md-nhl.out b/usr.bin/ncal/tests/regress.r-y2008-md-nhl.out
index 18191f6..18191f6 100644
--- a/tools/regression/usr.bin/ncal/regress.r-y2008-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-y2008-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-y2009-jd-nhl.out b/usr.bin/ncal/tests/regress.r-y2009-jd-nhl.out
index 3869ace..3869ace 100644
--- a/tools/regression/usr.bin/ncal/regress.r-y2009-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-y2009-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-y2009-md-nhl.out b/usr.bin/ncal/tests/regress.r-y2009-md-nhl.out
index 43496e9..43496e9 100644
--- a/tools/regression/usr.bin/ncal/regress.r-y2009-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-y2009-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-y2010-jd-nhl.out b/usr.bin/ncal/tests/regress.r-y2010-jd-nhl.out
index affd536..affd536 100644
--- a/tools/regression/usr.bin/ncal/regress.r-y2010-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-y2010-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-y2010-md-nhl.out b/usr.bin/ncal/tests/regress.r-y2010-md-nhl.out
index 8649c16..8649c16 100644
--- a/tools/regression/usr.bin/ncal/regress.r-y2010-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-y2010-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-y2011-jd-nhl.out b/usr.bin/ncal/tests/regress.r-y2011-jd-nhl.out
index a4a71c2..a4a71c2 100644
--- a/tools/regression/usr.bin/ncal/regress.r-y2011-jd-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-y2011-jd-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.r-y2011-md-nhl.out b/usr.bin/ncal/tests/regress.r-y2011-md-nhl.out
index 8852932..8852932 100644
--- a/tools/regression/usr.bin/ncal/regress.r-y2011-md-nhl.out
+++ b/usr.bin/ncal/tests/regress.r-y2011-md-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-b-3-nhl.out b/usr.bin/ncal/tests/regress.s-b-3-nhl.out
index ccb6b36..ccb6b36 100644
--- a/tools/regression/usr.bin/ncal/regress.s-b-3-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-b-3-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-b-A-nhl.out b/usr.bin/ncal/tests/regress.s-b-A-nhl.out
index 19149ca6..19149ca6 100644
--- a/tools/regression/usr.bin/ncal/regress.s-b-A-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-b-A-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-b-AB-nhl.out b/usr.bin/ncal/tests/regress.s-b-AB-nhl.out
index ccb6b36..ccb6b36 100644
--- a/tools/regression/usr.bin/ncal/regress.s-b-AB-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-b-AB-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-b-B-nhl.out b/usr.bin/ncal/tests/regress.s-b-B-nhl.out
index 5d61423..5d61423 100644
--- a/tools/regression/usr.bin/ncal/regress.s-b-B-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-b-B-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-b-gmgy-nhl.out b/usr.bin/ncal/tests/regress.s-b-gmgy-nhl.out
index 5620051..5620051 100644
--- a/tools/regression/usr.bin/ncal/regress.s-b-gmgy-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-b-gmgy-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-b-m-nhl.out b/usr.bin/ncal/tests/regress.s-b-m-nhl.out
index 37b9ffa..37b9ffa 100644
--- a/tools/regression/usr.bin/ncal/regress.s-b-m-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-b-m-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-b-mgy-nhl.out b/usr.bin/ncal/tests/regress.s-b-mgy-nhl.out
index 5620051..5620051 100644
--- a/tools/regression/usr.bin/ncal/regress.s-b-mgy-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-b-mgy-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-r-3-nhl.out b/usr.bin/ncal/tests/regress.s-r-3-nhl.out
index 9a816b7..9a816b7 100644
--- a/tools/regression/usr.bin/ncal/regress.s-r-3-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-r-3-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-r-A-nhl.out b/usr.bin/ncal/tests/regress.s-r-A-nhl.out
index 603c2cf..603c2cf 100644
--- a/tools/regression/usr.bin/ncal/regress.s-r-A-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-r-A-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-r-AB-nhl.out b/usr.bin/ncal/tests/regress.s-r-AB-nhl.out
index 9a816b7..9a816b7 100644
--- a/tools/regression/usr.bin/ncal/regress.s-r-AB-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-r-AB-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-r-B-nhl.out b/usr.bin/ncal/tests/regress.s-r-B-nhl.out
index 94614da..94614da 100644
--- a/tools/regression/usr.bin/ncal/regress.s-r-B-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-r-B-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-r-gmgy-nhl.out b/usr.bin/ncal/tests/regress.s-r-gmgy-nhl.out
index 0b42e41..0b42e41 100644
--- a/tools/regression/usr.bin/ncal/regress.s-r-gmgy-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-r-gmgy-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-r-m-nhl.out b/usr.bin/ncal/tests/regress.s-r-m-nhl.out
index 34b939d..34b939d 100644
--- a/tools/regression/usr.bin/ncal/regress.s-r-m-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-r-m-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.s-r-mgy-nhl.out b/usr.bin/ncal/tests/regress.s-r-mgy-nhl.out
index 0b42e41..0b42e41 100644
--- a/tools/regression/usr.bin/ncal/regress.s-r-mgy-nhl.out
+++ b/usr.bin/ncal/tests/regress.s-r-mgy-nhl.out
diff --git a/tools/regression/usr.bin/ncal/regress.sh b/usr.bin/ncal/tests/regress.sh
index 709744f..709744f 100644
--- a/tools/regression/usr.bin/ncal/regress.sh
+++ b/usr.bin/ncal/tests/regress.sh
diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile
index c91c4e3..31047c5 100644
--- a/usr.bin/printf/Makefile
+++ b/usr.bin/printf/Makefile
@@ -1,6 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	printf
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/printf/tests/Makefile b/usr.bin/printf/tests/Makefile
new file mode 100644
index 0000000..da3f533
--- /dev/null
+++ b/usr.bin/printf/tests/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/printf
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.b.out
+FILES+=		regress.d.out
+FILES+=		regress.f.out
+FILES+=		regress.l1.out
+FILES+=		regress.l2.out
+FILES+=		regress.m1.out
+FILES+=		regress.m2.out
+FILES+=		regress.m3.out
+FILES+=		regress.m4.out
+FILES+=		regress.m5.out
+FILES+=		regress.s.out
+FILES+=		regress.sh
+FILES+=		regress.zero.out
+
+.include <bsd.test.mk>
diff --git a/usr.bin/printf/tests/legacy_test.sh b/usr.bin/printf/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/printf/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/printf/regress.b.out b/usr.bin/printf/tests/regress.b.out
index 0373d93..0373d93 100644
--- a/tools/regression/usr.bin/printf/regress.b.out
+++ b/usr.bin/printf/tests/regress.b.out
diff --git a/tools/regression/usr.bin/printf/regress.d.out b/usr.bin/printf/tests/regress.d.out
index da83c08..da83c08 100644
--- a/tools/regression/usr.bin/printf/regress.d.out
+++ b/usr.bin/printf/tests/regress.d.out
diff --git a/tools/regression/usr.bin/printf/regress.f.out b/usr.bin/printf/tests/regress.f.out
index 127cb8a..127cb8a 100644
--- a/tools/regression/usr.bin/printf/regress.f.out
+++ b/usr.bin/printf/tests/regress.f.out
diff --git a/tools/regression/usr.bin/printf/regress.l1.out b/usr.bin/printf/tests/regress.l1.out
index 9be0dc9..9be0dc9 100644
--- a/tools/regression/usr.bin/printf/regress.l1.out
+++ b/usr.bin/printf/tests/regress.l1.out
diff --git a/tools/regression/usr.bin/printf/regress.l2.out b/usr.bin/printf/tests/regress.l2.out
index 9be0dc9..9be0dc9 100644
--- a/tools/regression/usr.bin/printf/regress.l2.out
+++ b/usr.bin/printf/tests/regress.l2.out
diff --git a/tools/regression/usr.bin/printf/regress.m1.out b/usr.bin/printf/tests/regress.m1.out
index a9e063e..a9e063e 100644
--- a/tools/regression/usr.bin/printf/regress.m1.out
+++ b/usr.bin/printf/tests/regress.m1.out
diff --git a/tools/regression/usr.bin/printf/regress.m2.out b/usr.bin/printf/tests/regress.m2.out
index 8baef1b..8baef1b 100644
--- a/tools/regression/usr.bin/printf/regress.m2.out
+++ b/usr.bin/printf/tests/regress.m2.out
diff --git a/tools/regression/usr.bin/printf/regress.m3.out b/usr.bin/printf/tests/regress.m3.out
index bbe4e70..bbe4e70 100644
--- a/tools/regression/usr.bin/printf/regress.m3.out
+++ b/usr.bin/printf/tests/regress.m3.out
diff --git a/tools/regression/usr.bin/printf/regress.m4.out b/usr.bin/printf/tests/regress.m4.out
index 5e0b5d4..5e0b5d4 100644
--- a/tools/regression/usr.bin/printf/regress.m4.out
+++ b/usr.bin/printf/tests/regress.m4.out
diff --git a/tools/regression/usr.bin/printf/regress.m5.out b/usr.bin/printf/tests/regress.m5.out
index 2838468..2838468 100644
--- a/tools/regression/usr.bin/printf/regress.m5.out
+++ b/usr.bin/printf/tests/regress.m5.out
diff --git a/tools/regression/usr.bin/printf/regress.s.out b/usr.bin/printf/tests/regress.s.out
index 3d572b9..3d572b9 100644
--- a/tools/regression/usr.bin/printf/regress.s.out
+++ b/usr.bin/printf/tests/regress.s.out
diff --git a/tools/regression/usr.bin/printf/regress.sh b/usr.bin/printf/tests/regress.sh
index 84e183b..84e183b 100644
--- a/tools/regression/usr.bin/printf/regress.sh
+++ b/usr.bin/printf/tests/regress.sh
diff --git a/tools/regression/usr.bin/printf/regress.zero.out b/usr.bin/printf/tests/regress.zero.out
index fa8f08c..fa8f08c 100644
--- a/tools/regression/usr.bin/printf/regress.zero.out
+++ b/usr.bin/printf/tests/regress.zero.out
diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile
index 1fbce17..b635c89 100644
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@@ -1,9 +1,15 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	sed
 SRCS=	compile.c main.c misc.c process.c
 
 WARNS?=	2
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/sed/tests/Makefile b/usr.bin/sed/tests/Makefile
new file mode 100644
index 0000000..02d2b89
--- /dev/null
+++ b/usr.bin/sed/tests/Makefile
@@ -0,0 +1,39 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/sed
+
+TAP_TESTS_SH=	legacy_test
+TAP_TESTS_SH+=	multi_test
+TEST_METADATA.multi_test+=	required_files="/usr/share/dict/words"
+TAP_TESTS_SH+=	inplace_race_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		hanoi.sed
+FILES+=		math.sed
+FILES+=		regress.G.out
+FILES+=		regress.P.out
+FILES+=		regress.b2a.out
+FILES+=		regress.bcb.out
+FILES+=		regress.c0.out
+FILES+=		regress.c1.out
+FILES+=		regress.c2.out
+FILES+=		regress.c3.out
+FILES+=		regress.hanoi.out
+FILES+=		regress.icase1.out
+FILES+=		regress.icase2.out
+FILES+=		regress.icase3.out
+FILES+=		regress.icase4.out
+FILES+=		regress.in
+FILES+=		regress.math.out
+FILES+=		regress.not.out
+FILES+=		regress.psl.out
+FILES+=		regress.s3.out
+FILES+=		regress.s4.out
+FILES+=		regress.s5.out
+FILES+=		regress.sg.out
+FILES+=		regress.sh
+FILES+=		regress.y.out
+
+SUBDIR=		regress.multitest.out
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/sed/hanoi.sed b/usr.bin/sed/tests/hanoi.sed
index 6a45dea..6a45dea 100644
--- a/tools/regression/usr.bin/sed/hanoi.sed
+++ b/usr.bin/sed/tests/hanoi.sed
diff --git a/tools/regression/usr.bin/sed/inplace_race.t b/usr.bin/sed/tests/inplace_race_test.sh
index d441ffe..d8220ae 100644
--- a/tools/regression/usr.bin/sed/inplace_race.t
+++ b/usr.bin/sed/tests/inplace_race_test.sh
@@ -42,10 +42,6 @@ fi
 
 echo "1..1"
 
-T=$(mktemp -d "${TMPDIR:-/tmp}/sed-test.XXXXXX")
-trap 'cd /; rm -rf "$T"' 0
-cd "$T"
-
 data=abababab
 data=$data$data$data$data
 data=$data$data$data$data
diff --git a/usr.bin/sed/tests/legacy_test.sh b/usr.bin/sed/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/sed/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/sed/math.sed b/usr.bin/sed/tests/math.sed
index 8c8de37..8c8de37 100644
--- a/tools/regression/usr.bin/sed/math.sed
+++ b/usr.bin/sed/tests/math.sed
diff --git a/tools/regression/usr.bin/sed/multitest.t b/usr.bin/sed/tests/multi_test.sh
index a6588ff..d821832 100644
--- a/tools/regression/usr.bin/sed/multitest.t
+++ b/usr.bin/sed/tests/multi_test.sh
@@ -41,10 +41,11 @@
 # of the BSD sed.  Each test should have a unique mark name, which is
 # used for naming the corresponding file in regress.multitest.out.
 
+SRCDIR=$(dirname $0)
+
 main()
 {
-	cd `dirname $0`
-	REGRESS=regress.multitest.out
+	REGRESS=${SRCDIR}/regress.multitest.out
 	DICT=/usr/share/dict/words
 
 	awk 'END { for (i = 1; i < 15; i++) print "l1_" i}' </dev/null >lines1
diff --git a/tools/regression/usr.bin/sed/regress.G.out b/usr.bin/sed/tests/regress.G.out
index 49c277c..49c277c 100644
--- a/tools/regression/usr.bin/sed/regress.G.out
+++ b/usr.bin/sed/tests/regress.G.out
diff --git a/tools/regression/usr.bin/sed/regress.P.out b/usr.bin/sed/tests/regress.P.out
index 4d3284f..4d3284f 100644
--- a/tools/regression/usr.bin/sed/regress.P.out
+++ b/usr.bin/sed/tests/regress.P.out
diff --git a/tools/regression/usr.bin/sed/regress.b2a.out b/usr.bin/sed/tests/regress.b2a.out
index a44df51..a44df51 100644
--- a/tools/regression/usr.bin/sed/regress.b2a.out
+++ b/usr.bin/sed/tests/regress.b2a.out
diff --git a/tools/regression/usr.bin/sed/regress.bcb.out b/usr.bin/sed/tests/regress.bcb.out
index 2a26e6a..2a26e6a 100644
--- a/tools/regression/usr.bin/sed/regress.bcb.out
+++ b/usr.bin/sed/tests/regress.bcb.out
diff --git a/tools/regression/usr.bin/sed/regress.c0.out b/usr.bin/sed/tests/regress.c0.out
index a1f8944..a1f8944 100644
--- a/tools/regression/usr.bin/sed/regress.c0.out
+++ b/usr.bin/sed/tests/regress.c0.out
diff --git a/tools/regression/usr.bin/sed/regress.c1.out b/usr.bin/sed/tests/regress.c1.out
index 21af01e..21af01e 100644
--- a/tools/regression/usr.bin/sed/regress.c1.out
+++ b/usr.bin/sed/tests/regress.c1.out
diff --git a/tools/regression/usr.bin/sed/regress.c2.out b/usr.bin/sed/tests/regress.c2.out
index 6c54a8d..6c54a8d 100644
--- a/tools/regression/usr.bin/sed/regress.c2.out
+++ b/usr.bin/sed/tests/regress.c2.out
diff --git a/tools/regression/usr.bin/sed/regress.c3.out b/usr.bin/sed/tests/regress.c3.out
index 6c54a8d..6c54a8d 100644
--- a/tools/regression/usr.bin/sed/regress.c3.out
+++ b/usr.bin/sed/tests/regress.c3.out
diff --git a/tools/regression/usr.bin/sed/regress.hanoi.out b/usr.bin/sed/tests/regress.hanoi.out
index ec39ea2..ec39ea2 100644
--- a/tools/regression/usr.bin/sed/regress.hanoi.out
+++ b/usr.bin/sed/tests/regress.hanoi.out
diff --git a/tools/regression/usr.bin/sed/regress.icase1.out b/usr.bin/sed/tests/regress.icase1.out
index a610a0b..a610a0b 100644
--- a/tools/regression/usr.bin/sed/regress.icase1.out
+++ b/usr.bin/sed/tests/regress.icase1.out
diff --git a/tools/regression/usr.bin/sed/regress.icase2.out b/usr.bin/sed/tests/regress.icase2.out
index b803373..b803373 100644
--- a/tools/regression/usr.bin/sed/regress.icase2.out
+++ b/usr.bin/sed/tests/regress.icase2.out
diff --git a/tools/regression/usr.bin/sed/regress.icase3.out b/usr.bin/sed/tests/regress.icase3.out
index 2a26e6a..2a26e6a 100644
--- a/tools/regression/usr.bin/sed/regress.icase3.out
+++ b/usr.bin/sed/tests/regress.icase3.out
diff --git a/tools/regression/usr.bin/sed/regress.icase4.out b/usr.bin/sed/tests/regress.icase4.out
index b803373..b803373 100644
--- a/tools/regression/usr.bin/sed/regress.icase4.out
+++ b/usr.bin/sed/tests/regress.icase4.out
diff --git a/tools/regression/usr.bin/sed/regress.in b/usr.bin/sed/tests/regress.in
index 2a26e6a..2a26e6a 100644
--- a/tools/regression/usr.bin/sed/regress.in
+++ b/usr.bin/sed/tests/regress.in
diff --git a/tools/regression/usr.bin/sed/regress.math.out b/usr.bin/sed/tests/regress.math.out
index 3fdcd7c..3fdcd7c 100644
--- a/tools/regression/usr.bin/sed/regress.math.out
+++ b/usr.bin/sed/tests/regress.math.out
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.1 b/usr.bin/sed/tests/regress.multitest.out/1.1
index 70fd43b..70fd43b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.1
+++ b/usr.bin/sed/tests/regress.multitest.out/1.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.10 b/usr.bin/sed/tests/regress.multitest.out/1.10
index 44f4ec3..44f4ec3 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.10
+++ b/usr.bin/sed/tests/regress.multitest.out/1.10
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.11 b/usr.bin/sed/tests/regress.multitest.out/1.11
index 7af945d..7af945d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.11
+++ b/usr.bin/sed/tests/regress.multitest.out/1.11
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.12 b/usr.bin/sed/tests/regress.multitest.out/1.12
index 7af945d..7af945d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.12
+++ b/usr.bin/sed/tests/regress.multitest.out/1.12
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.13 b/usr.bin/sed/tests/regress.multitest.out/1.13
index 90582c8..90582c8 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.13
+++ b/usr.bin/sed/tests/regress.multitest.out/1.13
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.14 b/usr.bin/sed/tests/regress.multitest.out/1.14
index fd78274..fd78274 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.14
+++ b/usr.bin/sed/tests/regress.multitest.out/1.14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.15 b/usr.bin/sed/tests/regress.multitest.out/1.15
index 7b3700c..7b3700c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.15
+++ b/usr.bin/sed/tests/regress.multitest.out/1.15
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.16 b/usr.bin/sed/tests/regress.multitest.out/1.16
index 2bfa3fe..2bfa3fe 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.16
+++ b/usr.bin/sed/tests/regress.multitest.out/1.16
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.17 b/usr.bin/sed/tests/regress.multitest.out/1.17
index 0833b55..0833b55 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.17
+++ b/usr.bin/sed/tests/regress.multitest.out/1.17
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.18 b/usr.bin/sed/tests/regress.multitest.out/1.18
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.18
+++ b/usr.bin/sed/tests/regress.multitest.out/1.18
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.2 b/usr.bin/sed/tests/regress.multitest.out/1.2
index 7af945d..7af945d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.2
+++ b/usr.bin/sed/tests/regress.multitest.out/1.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.3 b/usr.bin/sed/tests/regress.multitest.out/1.3
index 70fd43b..70fd43b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.3
+++ b/usr.bin/sed/tests/regress.multitest.out/1.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.4 b/usr.bin/sed/tests/regress.multitest.out/1.4
index 7af945d..7af945d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.4
+++ b/usr.bin/sed/tests/regress.multitest.out/1.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1 b/usr.bin/sed/tests/regress.multitest.out/1.4.1
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1
+++ b/usr.bin/sed/tests/regress.multitest.out/1.4.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.5 b/usr.bin/sed/tests/regress.multitest.out/1.5
index dfd85f7..dfd85f7 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.5
+++ b/usr.bin/sed/tests/regress.multitest.out/1.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.6 b/usr.bin/sed/tests/regress.multitest.out/1.6
index dfd85f7..dfd85f7 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.6
+++ b/usr.bin/sed/tests/regress.multitest.out/1.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.7 b/usr.bin/sed/tests/regress.multitest.out/1.7
index 70fd43b..70fd43b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.7
+++ b/usr.bin/sed/tests/regress.multitest.out/1.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.8 b/usr.bin/sed/tests/regress.multitest.out/1.8
index 70fd43b..70fd43b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.8
+++ b/usr.bin/sed/tests/regress.multitest.out/1.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1.9 b/usr.bin/sed/tests/regress.multitest.out/1.9
index 44f4ec3..44f4ec3 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1.9
+++ b/usr.bin/sed/tests/regress.multitest.out/1.9
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.1 b/usr.bin/sed/tests/regress.multitest.out/2.1
index a7c92f0..a7c92f0 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.1
+++ b/usr.bin/sed/tests/regress.multitest.out/2.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.10 b/usr.bin/sed/tests/regress.multitest.out/2.10
index 8e6f085..8e6f085 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.10
+++ b/usr.bin/sed/tests/regress.multitest.out/2.10
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.11 b/usr.bin/sed/tests/regress.multitest.out/2.11
index 8e6f085..8e6f085 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.11
+++ b/usr.bin/sed/tests/regress.multitest.out/2.11
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.12 b/usr.bin/sed/tests/regress.multitest.out/2.12
index ddd4976..ddd4976 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.12
+++ b/usr.bin/sed/tests/regress.multitest.out/2.12
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.13 b/usr.bin/sed/tests/regress.multitest.out/2.13
index d08d35c..d08d35c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.13
+++ b/usr.bin/sed/tests/regress.multitest.out/2.13
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.14 b/usr.bin/sed/tests/regress.multitest.out/2.14
index d08d35c..d08d35c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.14
+++ b/usr.bin/sed/tests/regress.multitest.out/2.14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.15 b/usr.bin/sed/tests/regress.multitest.out/2.15
index 1f20a52..1f20a52 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.15
+++ b/usr.bin/sed/tests/regress.multitest.out/2.15
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.16 b/usr.bin/sed/tests/regress.multitest.out/2.16
index 4d8dc1e..4d8dc1e 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.16
+++ b/usr.bin/sed/tests/regress.multitest.out/2.16
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.17 b/usr.bin/sed/tests/regress.multitest.out/2.17
index df7978f..df7978f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.17
+++ b/usr.bin/sed/tests/regress.multitest.out/2.17
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.18 b/usr.bin/sed/tests/regress.multitest.out/2.18
index c4d558b..c4d558b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.18
+++ b/usr.bin/sed/tests/regress.multitest.out/2.18
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.19 b/usr.bin/sed/tests/regress.multitest.out/2.19
index 7fb81db..7fb81db 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.19
+++ b/usr.bin/sed/tests/regress.multitest.out/2.19
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.2 b/usr.bin/sed/tests/regress.multitest.out/2.2
index fe925b0..fe925b0 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.2
+++ b/usr.bin/sed/tests/regress.multitest.out/2.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.20 b/usr.bin/sed/tests/regress.multitest.out/2.20
index 8e6f085..8e6f085 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.20
+++ b/usr.bin/sed/tests/regress.multitest.out/2.20
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.21 b/usr.bin/sed/tests/regress.multitest.out/2.21
index 1a9e066..1a9e066 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.21
+++ b/usr.bin/sed/tests/regress.multitest.out/2.21
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.22 b/usr.bin/sed/tests/regress.multitest.out/2.22
index b182791..b182791 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.22
+++ b/usr.bin/sed/tests/regress.multitest.out/2.22
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.3 b/usr.bin/sed/tests/regress.multitest.out/2.3
index 6165ce8..6165ce8 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.3
+++ b/usr.bin/sed/tests/regress.multitest.out/2.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.4 b/usr.bin/sed/tests/regress.multitest.out/2.4
index 1502f00..1502f00 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.4
+++ b/usr.bin/sed/tests/regress.multitest.out/2.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.5 b/usr.bin/sed/tests/regress.multitest.out/2.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.5
+++ b/usr.bin/sed/tests/regress.multitest.out/2.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.6 b/usr.bin/sed/tests/regress.multitest.out/2.6
index 1502f00..1502f00 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.6
+++ b/usr.bin/sed/tests/regress.multitest.out/2.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.7 b/usr.bin/sed/tests/regress.multitest.out/2.7
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.7
+++ b/usr.bin/sed/tests/regress.multitest.out/2.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.8 b/usr.bin/sed/tests/regress.multitest.out/2.8
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.8
+++ b/usr.bin/sed/tests/regress.multitest.out/2.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2.9 b/usr.bin/sed/tests/regress.multitest.out/2.9
index 8e6f085..8e6f085 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2.9
+++ b/usr.bin/sed/tests/regress.multitest.out/2.9
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/3.1 b/usr.bin/sed/tests/regress.multitest.out/3.1
index f963b03..f963b03 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/3.1
+++ b/usr.bin/sed/tests/regress.multitest.out/3.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/3.2 b/usr.bin/sed/tests/regress.multitest.out/3.2
index 488e94f..488e94f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/3.2
+++ b/usr.bin/sed/tests/regress.multitest.out/3.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/3.3 b/usr.bin/sed/tests/regress.multitest.out/3.3
index 5b15dae..5b15dae 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/3.3
+++ b/usr.bin/sed/tests/regress.multitest.out/3.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/3.4 b/usr.bin/sed/tests/regress.multitest.out/3.4
index 67f03ef..67f03ef 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/3.4
+++ b/usr.bin/sed/tests/regress.multitest.out/3.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4.1 b/usr.bin/sed/tests/regress.multitest.out/4.1
index 455093c..455093c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/4.1
+++ b/usr.bin/sed/tests/regress.multitest.out/4.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4.2 b/usr.bin/sed/tests/regress.multitest.out/4.2
index 4161c1c..4161c1c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/4.2
+++ b/usr.bin/sed/tests/regress.multitest.out/4.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4.3 b/usr.bin/sed/tests/regress.multitest.out/4.3
index ccfa194..ccfa194 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/4.3
+++ b/usr.bin/sed/tests/regress.multitest.out/4.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4.4 b/usr.bin/sed/tests/regress.multitest.out/4.4
index 94e9a6d..94e9a6d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/4.4
+++ b/usr.bin/sed/tests/regress.multitest.out/4.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4.5 b/usr.bin/sed/tests/regress.multitest.out/4.5
index ce01362..ce01362 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/4.5
+++ b/usr.bin/sed/tests/regress.multitest.out/4.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4.6 b/usr.bin/sed/tests/regress.multitest.out/4.6
index ce01362..ce01362 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/4.6
+++ b/usr.bin/sed/tests/regress.multitest.out/4.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4.7 b/usr.bin/sed/tests/regress.multitest.out/4.7
index ce01362..ce01362 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/4.7
+++ b/usr.bin/sed/tests/regress.multitest.out/4.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4.8 b/usr.bin/sed/tests/regress.multitest.out/4.8
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/4.8
+++ b/usr.bin/sed/tests/regress.multitest.out/4.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5.1 b/usr.bin/sed/tests/regress.multitest.out/5.1
index ac9202e..ac9202e 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/5.1
+++ b/usr.bin/sed/tests/regress.multitest.out/5.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5.2 b/usr.bin/sed/tests/regress.multitest.out/5.2
index ec339f4..ec339f4 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/5.2
+++ b/usr.bin/sed/tests/regress.multitest.out/5.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5.3 b/usr.bin/sed/tests/regress.multitest.out/5.3
index e1ddb54..e1ddb54 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/5.3
+++ b/usr.bin/sed/tests/regress.multitest.out/5.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5.4 b/usr.bin/sed/tests/regress.multitest.out/5.4
index a9ec85b..a9ec85b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/5.4
+++ b/usr.bin/sed/tests/regress.multitest.out/5.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5.5 b/usr.bin/sed/tests/regress.multitest.out/5.5
index 6766fea..6766fea 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/5.5
+++ b/usr.bin/sed/tests/regress.multitest.out/5.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5.6 b/usr.bin/sed/tests/regress.multitest.out/5.6
index 7ffbba3..7ffbba3 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/5.6
+++ b/usr.bin/sed/tests/regress.multitest.out/5.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5.7 b/usr.bin/sed/tests/regress.multitest.out/5.7
index f15f6e3..f15f6e3 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/5.7
+++ b/usr.bin/sed/tests/regress.multitest.out/5.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5.8 b/usr.bin/sed/tests/regress.multitest.out/5.8
index 1557318..1557318 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/5.8
+++ b/usr.bin/sed/tests/regress.multitest.out/5.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/6.1 b/usr.bin/sed/tests/regress.multitest.out/6.1
index 78db2a5..78db2a5 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/6.1
+++ b/usr.bin/sed/tests/regress.multitest.out/6.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/6.2 b/usr.bin/sed/tests/regress.multitest.out/6.2
index 77e5cc0..77e5cc0 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/6.2
+++ b/usr.bin/sed/tests/regress.multitest.out/6.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/6.3 b/usr.bin/sed/tests/regress.multitest.out/6.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/6.3
+++ b/usr.bin/sed/tests/regress.multitest.out/6.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/6.4 b/usr.bin/sed/tests/regress.multitest.out/6.4
index e9169dc..e9169dc 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/6.4
+++ b/usr.bin/sed/tests/regress.multitest.out/6.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/6.5 b/usr.bin/sed/tests/regress.multitest.out/6.5
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/6.5
+++ b/usr.bin/sed/tests/regress.multitest.out/6.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/6.6 b/usr.bin/sed/tests/regress.multitest.out/6.6
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/6.6
+++ b/usr.bin/sed/tests/regress.multitest.out/6.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7.1 b/usr.bin/sed/tests/regress.multitest.out/7.1
index 586cac7..586cac7 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/7.1
+++ b/usr.bin/sed/tests/regress.multitest.out/7.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7.2 b/usr.bin/sed/tests/regress.multitest.out/7.2
index cb8d266..cb8d266 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/7.2
+++ b/usr.bin/sed/tests/regress.multitest.out/7.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7.3 b/usr.bin/sed/tests/regress.multitest.out/7.3
index c742250..c742250 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/7.3
+++ b/usr.bin/sed/tests/regress.multitest.out/7.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7.4 b/usr.bin/sed/tests/regress.multitest.out/7.4
index 19a9461..19a9461 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/7.4
+++ b/usr.bin/sed/tests/regress.multitest.out/7.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7.5 b/usr.bin/sed/tests/regress.multitest.out/7.5
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/7.5
+++ b/usr.bin/sed/tests/regress.multitest.out/7.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7.6 b/usr.bin/sed/tests/regress.multitest.out/7.6
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/7.6
+++ b/usr.bin/sed/tests/regress.multitest.out/7.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7.7 b/usr.bin/sed/tests/regress.multitest.out/7.7
index 7baa931..7baa931 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/7.7
+++ b/usr.bin/sed/tests/regress.multitest.out/7.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7.8 b/usr.bin/sed/tests/regress.multitest.out/7.8
index 8b13789..8b13789 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/7.8
+++ b/usr.bin/sed/tests/regress.multitest.out/7.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.1 b/usr.bin/sed/tests/regress.multitest.out/8.1
index dcf124b..dcf124b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.1
+++ b/usr.bin/sed/tests/regress.multitest.out/8.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.10 b/usr.bin/sed/tests/regress.multitest.out/8.10
index 86f75c15..86f75c15 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.10
+++ b/usr.bin/sed/tests/regress.multitest.out/8.10
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.11 b/usr.bin/sed/tests/regress.multitest.out/8.11
index 70a0f11..70a0f11 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.11
+++ b/usr.bin/sed/tests/regress.multitest.out/8.11
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.12 b/usr.bin/sed/tests/regress.multitest.out/8.12
index ded4e98..ded4e98 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.12
+++ b/usr.bin/sed/tests/regress.multitest.out/8.12
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.13 b/usr.bin/sed/tests/regress.multitest.out/8.13
index 48646d1..48646d1 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.13
+++ b/usr.bin/sed/tests/regress.multitest.out/8.13
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.14 b/usr.bin/sed/tests/regress.multitest.out/8.14
index 48646d1..48646d1 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.14
+++ b/usr.bin/sed/tests/regress.multitest.out/8.14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.15 b/usr.bin/sed/tests/regress.multitest.out/8.15
index f414bb5..f414bb5 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.15
+++ b/usr.bin/sed/tests/regress.multitest.out/8.15
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.16 b/usr.bin/sed/tests/regress.multitest.out/8.16
index 230cc08..230cc08 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.16
+++ b/usr.bin/sed/tests/regress.multitest.out/8.16
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.17 b/usr.bin/sed/tests/regress.multitest.out/8.17
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.17
+++ b/usr.bin/sed/tests/regress.multitest.out/8.17
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.18 b/usr.bin/sed/tests/regress.multitest.out/8.18
index 833e1ba..833e1ba 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.18
+++ b/usr.bin/sed/tests/regress.multitest.out/8.18
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.19 b/usr.bin/sed/tests/regress.multitest.out/8.19
index 6536cb8..6536cb8 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.19
+++ b/usr.bin/sed/tests/regress.multitest.out/8.19
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.2 b/usr.bin/sed/tests/regress.multitest.out/8.2
index dcf124b..dcf124b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.2
+++ b/usr.bin/sed/tests/regress.multitest.out/8.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.20 b/usr.bin/sed/tests/regress.multitest.out/8.20
index f9adada..f9adada 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.20
+++ b/usr.bin/sed/tests/regress.multitest.out/8.20
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.21 b/usr.bin/sed/tests/regress.multitest.out/8.21
index ec4d9e6..ec4d9e6 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.21
+++ b/usr.bin/sed/tests/regress.multitest.out/8.21
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.22 b/usr.bin/sed/tests/regress.multitest.out/8.22
index 1191247..1191247 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.22
+++ b/usr.bin/sed/tests/regress.multitest.out/8.22
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.23 b/usr.bin/sed/tests/regress.multitest.out/8.23
index c66dd65..c66dd65 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.23
+++ b/usr.bin/sed/tests/regress.multitest.out/8.23
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.3 b/usr.bin/sed/tests/regress.multitest.out/8.3
index dcf124b..dcf124b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.3
+++ b/usr.bin/sed/tests/regress.multitest.out/8.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.4 b/usr.bin/sed/tests/regress.multitest.out/8.4
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.4
+++ b/usr.bin/sed/tests/regress.multitest.out/8.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.5 b/usr.bin/sed/tests/regress.multitest.out/8.5
index 833e1ba..833e1ba 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.5
+++ b/usr.bin/sed/tests/regress.multitest.out/8.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.6 b/usr.bin/sed/tests/regress.multitest.out/8.6
index 47c08ae..47c08ae 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.6
+++ b/usr.bin/sed/tests/regress.multitest.out/8.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.7 b/usr.bin/sed/tests/regress.multitest.out/8.7
index 0ff0b9e..0ff0b9e 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.7
+++ b/usr.bin/sed/tests/regress.multitest.out/8.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.8 b/usr.bin/sed/tests/regress.multitest.out/8.8
index 08bbf8c..08bbf8c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.8
+++ b/usr.bin/sed/tests/regress.multitest.out/8.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.9 b/usr.bin/sed/tests/regress.multitest.out/8.9
index e0cd8b5..e0cd8b5 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8.9
+++ b/usr.bin/sed/tests/regress.multitest.out/8.9
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.1 b/usr.bin/sed/tests/regress.multitest.out/9.1
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.1
+++ b/usr.bin/sed/tests/regress.multitest.out/9.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.10 b/usr.bin/sed/tests/regress.multitest.out/9.10
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.10
+++ b/usr.bin/sed/tests/regress.multitest.out/9.10
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.11 b/usr.bin/sed/tests/regress.multitest.out/9.11
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.11
+++ b/usr.bin/sed/tests/regress.multitest.out/9.11
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.12 b/usr.bin/sed/tests/regress.multitest.out/9.12
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.12
+++ b/usr.bin/sed/tests/regress.multitest.out/9.12
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.13 b/usr.bin/sed/tests/regress.multitest.out/9.13
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.13
+++ b/usr.bin/sed/tests/regress.multitest.out/9.13
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.14 b/usr.bin/sed/tests/regress.multitest.out/9.14
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.14
+++ b/usr.bin/sed/tests/regress.multitest.out/9.14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.15 b/usr.bin/sed/tests/regress.multitest.out/9.15
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.15
+++ b/usr.bin/sed/tests/regress.multitest.out/9.15
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.16 b/usr.bin/sed/tests/regress.multitest.out/9.16
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.16
+++ b/usr.bin/sed/tests/regress.multitest.out/9.16
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.17 b/usr.bin/sed/tests/regress.multitest.out/9.17
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.17
+++ b/usr.bin/sed/tests/regress.multitest.out/9.17
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.18 b/usr.bin/sed/tests/regress.multitest.out/9.18
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.18
+++ b/usr.bin/sed/tests/regress.multitest.out/9.18
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.19 b/usr.bin/sed/tests/regress.multitest.out/9.19
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.19
+++ b/usr.bin/sed/tests/regress.multitest.out/9.19
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.2 b/usr.bin/sed/tests/regress.multitest.out/9.2
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.2
+++ b/usr.bin/sed/tests/regress.multitest.out/9.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.20 b/usr.bin/sed/tests/regress.multitest.out/9.20
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.20
+++ b/usr.bin/sed/tests/regress.multitest.out/9.20
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.21 b/usr.bin/sed/tests/regress.multitest.out/9.21
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.21
+++ b/usr.bin/sed/tests/regress.multitest.out/9.21
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.22 b/usr.bin/sed/tests/regress.multitest.out/9.22
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.22
+++ b/usr.bin/sed/tests/regress.multitest.out/9.22
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.23 b/usr.bin/sed/tests/regress.multitest.out/9.23
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.23
+++ b/usr.bin/sed/tests/regress.multitest.out/9.23
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.24 b/usr.bin/sed/tests/regress.multitest.out/9.24
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.24
+++ b/usr.bin/sed/tests/regress.multitest.out/9.24
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.25 b/usr.bin/sed/tests/regress.multitest.out/9.25
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.25
+++ b/usr.bin/sed/tests/regress.multitest.out/9.25
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.26 b/usr.bin/sed/tests/regress.multitest.out/9.26
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.26
+++ b/usr.bin/sed/tests/regress.multitest.out/9.26
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.27 b/usr.bin/sed/tests/regress.multitest.out/9.27
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.27
+++ b/usr.bin/sed/tests/regress.multitest.out/9.27
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.28 b/usr.bin/sed/tests/regress.multitest.out/9.28
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.28
+++ b/usr.bin/sed/tests/regress.multitest.out/9.28
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.29 b/usr.bin/sed/tests/regress.multitest.out/9.29
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.29
+++ b/usr.bin/sed/tests/regress.multitest.out/9.29
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.3 b/usr.bin/sed/tests/regress.multitest.out/9.3
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.3
+++ b/usr.bin/sed/tests/regress.multitest.out/9.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.30 b/usr.bin/sed/tests/regress.multitest.out/9.30
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.30
+++ b/usr.bin/sed/tests/regress.multitest.out/9.30
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.31 b/usr.bin/sed/tests/regress.multitest.out/9.31
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.31
+++ b/usr.bin/sed/tests/regress.multitest.out/9.31
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.4 b/usr.bin/sed/tests/regress.multitest.out/9.4
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.4
+++ b/usr.bin/sed/tests/regress.multitest.out/9.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.5 b/usr.bin/sed/tests/regress.multitest.out/9.5
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.5
+++ b/usr.bin/sed/tests/regress.multitest.out/9.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.6 b/usr.bin/sed/tests/regress.multitest.out/9.6
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.6
+++ b/usr.bin/sed/tests/regress.multitest.out/9.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.7 b/usr.bin/sed/tests/regress.multitest.out/9.7
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.7
+++ b/usr.bin/sed/tests/regress.multitest.out/9.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.8 b/usr.bin/sed/tests/regress.multitest.out/9.8
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.8
+++ b/usr.bin/sed/tests/regress.multitest.out/9.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9.9 b/usr.bin/sed/tests/regress.multitest.out/9.9
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9.9
+++ b/usr.bin/sed/tests/regress.multitest.out/9.9
diff --git a/usr.bin/sed/tests/regress.multitest.out/Makefile b/usr.bin/sed/tests/regress.multitest.out/Makefile
new file mode 100644
index 0000000..0b2d0ba
--- /dev/null
+++ b/usr.bin/sed/tests/regress.multitest.out/Makefile
@@ -0,0 +1,136 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/sed/regress.multitest.out
+
+FILESDIR=	${TESTSDIR}
+FILES=		1.1
+FILES+=		1.10
+FILES+=		1.11
+FILES+=		1.12
+FILES+=		1.13
+FILES+=		1.14
+FILES+=		1.15
+FILES+=		1.16
+FILES+=		1.17
+FILES+=		1.18
+FILES+=		1.2
+FILES+=		1.3
+FILES+=		1.4
+FILES+=		1.4.1
+FILES+=		1.5
+FILES+=		1.6
+FILES+=		1.7
+FILES+=		1.8
+FILES+=		1.9
+FILES+=		2.1
+FILES+=		2.10
+FILES+=		2.11
+FILES+=		2.12
+FILES+=		2.13
+FILES+=		2.14
+FILES+=		2.15
+FILES+=		2.16
+FILES+=		2.17
+FILES+=		2.18
+FILES+=		2.19
+FILES+=		2.2
+FILES+=		2.20
+FILES+=		2.21
+FILES+=		2.22
+FILES+=		2.3
+FILES+=		2.4
+FILES+=		2.5
+FILES+=		2.6
+FILES+=		2.7
+FILES+=		2.8
+FILES+=		2.9
+FILES+=		3.1
+FILES+=		3.2
+FILES+=		3.3
+FILES+=		3.4
+FILES+=		4.1
+FILES+=		4.2
+FILES+=		4.3
+FILES+=		4.4
+FILES+=		4.5
+FILES+=		4.6
+FILES+=		4.7
+FILES+=		4.8
+FILES+=		5.1
+FILES+=		5.2
+FILES+=		5.3
+FILES+=		5.4
+FILES+=		5.5
+FILES+=		5.6
+FILES+=		5.7
+FILES+=		5.8
+FILES+=		6.1
+FILES+=		6.2
+FILES+=		6.3
+FILES+=		6.4
+FILES+=		6.5
+FILES+=		6.6
+FILES+=		7.1
+FILES+=		7.2
+FILES+=		7.3
+FILES+=		7.4
+FILES+=		7.5
+FILES+=		7.6
+FILES+=		7.7
+FILES+=		7.8
+FILES+=		8.1
+FILES+=		8.10
+FILES+=		8.11
+FILES+=		8.12
+FILES+=		8.13
+FILES+=		8.14
+FILES+=		8.15
+FILES+=		8.16
+FILES+=		8.17
+FILES+=		8.18
+FILES+=		8.19
+FILES+=		8.2
+FILES+=		8.20
+FILES+=		8.21
+FILES+=		8.22
+FILES+=		8.23
+FILES+=		8.3
+FILES+=		8.4
+FILES+=		8.5
+FILES+=		8.6
+FILES+=		8.7
+FILES+=		8.8
+FILES+=		8.9
+FILES+=		9.1
+FILES+=		9.10
+FILES+=		9.11
+FILES+=		9.12
+FILES+=		9.13
+FILES+=		9.14
+FILES+=		9.15
+FILES+=		9.16
+FILES+=		9.17
+FILES+=		9.18
+FILES+=		9.19
+FILES+=		9.2
+FILES+=		9.20
+FILES+=		9.21
+FILES+=		9.22
+FILES+=		9.23
+FILES+=		9.24
+FILES+=		9.25
+FILES+=		9.26
+FILES+=		9.27
+FILES+=		9.28
+FILES+=		9.29
+FILES+=		9.3
+FILES+=		9.30
+FILES+=		9.31
+FILES+=		9.4
+FILES+=		9.5
+FILES+=		9.6
+FILES+=		9.7
+FILES+=		9.8
+FILES+=		9.9
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/sed/regress.not.out b/usr.bin/sed/tests/regress.not.out
index 257cc56..257cc56 100644
--- a/tools/regression/usr.bin/sed/regress.not.out
+++ b/usr.bin/sed/tests/regress.not.out
diff --git a/tools/regression/usr.bin/sed/regress.psl.out b/usr.bin/sed/tests/regress.psl.out
index 8b38f4d..8b38f4d 100644
--- a/tools/regression/usr.bin/sed/regress.psl.out
+++ b/usr.bin/sed/tests/regress.psl.out
diff --git a/tools/regression/usr.bin/sed/regress.s3.out b/usr.bin/sed/tests/regress.s3.out
index 68dfa9b..68dfa9b 100644
--- a/tools/regression/usr.bin/sed/regress.s3.out
+++ b/usr.bin/sed/tests/regress.s3.out
diff --git a/tools/regression/usr.bin/sed/regress.s4.out b/usr.bin/sed/tests/regress.s4.out
index 03914ba..03914ba 100644
--- a/tools/regression/usr.bin/sed/regress.s4.out
+++ b/usr.bin/sed/tests/regress.s4.out
diff --git a/tools/regression/usr.bin/sed/regress.s5.out b/usr.bin/sed/tests/regress.s5.out
index 257cc56..257cc56 100644
--- a/tools/regression/usr.bin/sed/regress.s5.out
+++ b/usr.bin/sed/tests/regress.s5.out
diff --git a/tools/regression/usr.bin/sed/regress.sg.out b/usr.bin/sed/tests/regress.sg.out
index 7b24f2c..7b24f2c 100644
--- a/tools/regression/usr.bin/sed/regress.sg.out
+++ b/usr.bin/sed/tests/regress.sg.out
diff --git a/tools/regression/usr.bin/sed/regress.sh b/usr.bin/sed/tests/regress.sh
index c4c2a33..ad05bfe 100644
--- a/tools/regression/usr.bin/sed/regress.sh
+++ b/usr.bin/sed/tests/regress.sh
@@ -4,10 +4,10 @@ REGRESSION_START($1)
 
 echo '1..26'
 
-REGRESSION_TEST(`G', `sed G < regress.in')
-REGRESSION_TEST(`P', `sed P < regress.in')
-REGRESSION_TEST(`psl', `sed \$!g\;P\;D < regress.in')
-REGRESSION_TEST(`bcb', `sed s/X/$(jot -n -bx -s "" 2043)\\\\zz/ < regress.in')
+REGRESSION_TEST(`G', `sed G <${SRCDIR}/regress.in')
+REGRESSION_TEST(`P', `sed P <${SRCDIR}/regress.in')
+REGRESSION_TEST(`psl', `sed \$!g\;P\;D <${SRCDIR}/regress.in')
+REGRESSION_TEST(`bcb', `sed s/X/$(jot -n -bx -s "" 2043)\\\\zz/ <${SRCDIR}/regress.in')
 REGRESSION_TEST(`y', `echo -n foo | sed y/o/O/')
 REGRESSION_TEST(`sg', `echo foo | sed s/,*/,/g')
 REGRESSION_TEST(`s3', `echo foo | sed s/,*/,/3')
@@ -15,18 +15,18 @@ REGRESSION_TEST(`s4', `echo foo | sed s/,*/,/4')
 REGRESSION_TEST(`s5', `echo foo | sed s/,*/,/5')
 REGRESSION_TEST(`c0', `sed ''`c\
 foo
-''`< regress.in')
+''`<${SRCDIR}/regress.in')
 REGRESSION_TEST(`c1', `sed ''`4,$c\
 foo
-''`< regress.in')
+''`<${SRCDIR}/regress.in')
 REGRESSION_TEST(`c2', `sed ''`3,9c\
 foo
-''`< regress.in')
+''`<${SRCDIR}/regress.in')
 REGRESSION_TEST(`c3', `sed ''`3,/no such string/c\
 foo
-''`< regress.in')
+''`<${SRCDIR}/regress.in')
 REGRESSION_TEST(`b2a', `sed ''`2,3b
-1,2d''` < regress.in')
+1,2d''` <${SRCDIR}/regress.in')
 
 `
 inplace_test()
@@ -63,13 +63,13 @@ REGRESSION_TEST_FREEFORM(`inplace3', `inplace_test 20,99d')
 REGRESSION_TEST_FREEFORM(`inplace4', `inplace_test "{;{;8,30d;};}"')
 REGRESSION_TEST_FREEFORM(`inplace5', `inplace_test "3x;6G"')
 
-REGRESSION_TEST(`icase1', `sed /SED/Id < regress.in')
-REGRESSION_TEST(`icase2', `sed s/SED/Foo/I < regress.in')
-REGRESSION_TEST(`icase3', `sed s/SED/Foo/ < regress.in')
-REGRESSION_TEST(`icase4', `sed s/SED/Foo/i < regress.in')
+REGRESSION_TEST(`icase1', `sed /SED/Id <${SRCDIR}/regress.in')
+REGRESSION_TEST(`icase2', `sed s/SED/Foo/I <${SRCDIR}/regress.in')
+REGRESSION_TEST(`icase3', `sed s/SED/Foo/ <${SRCDIR}/regress.in')
+REGRESSION_TEST(`icase4', `sed s/SED/Foo/i <${SRCDIR}/regress.in')
 
-REGRESSION_TEST(`hanoi', `echo ":abcd: : :" | sed -f hanoi.sed')
-REGRESSION_TEST(`math', `echo "4+7*3+2^7/3" | sed -f math.sed')
+REGRESSION_TEST(`hanoi', `echo ":abcd: : :" | sed -f ${SRCDIR}/hanoi.sed')
+REGRESSION_TEST(`math', `echo "4+7*3+2^7/3" | sed -f ${SRCDIR}/math.sed')
 REGRESSION_TEST(`not', `echo foo | sed "1!!s/foo/bar/"')
 
 REGRESSION_END()
diff --git a/tools/regression/usr.bin/sed/regress.y.out b/usr.bin/sed/tests/regress.y.out
index 829a681..829a681 100644
--- a/tools/regression/usr.bin/sed/regress.y.out
+++ b/usr.bin/sed/tests/regress.y.out
diff --git a/usr.bin/tests/Makefile b/usr.bin/tests/Makefile
index f8ead88..af7a8bf 100644
--- a/usr.bin/tests/Makefile
+++ b/usr.bin/tests/Makefile
@@ -7,4 +7,7 @@ TESTSDIR=	${TESTSBASE}/usr.bin
 .PATH:		${.CURDIR:H:H}/tests
 KYUAFILE=	yes
 
+FILESDIR=	${TESTSDIR}
+FILES=		regress.m4
+
 .include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/regress.m4 b/usr.bin/tests/regress.m4
index 35e2ab9..53dfb14 100644
--- a/tools/regression/usr.bin/regress.m4
+++ b/usr.bin/tests/regress.m4
@@ -29,7 +29,7 @@ dnl command/commands to execute for the actual test.  Their exit status is
 dnl checked.  It is assumed that the test will output to stdout, and that the
 dnl output to be used to check for regression will be in regress.TESTNAME.out.
 define(`REGRESSION_TEST',
-$2 | diff -u regress.$1.out -
+$2 | diff -u ${SRCDIR:-.}/regress.$1.out -
 REGRESSION_PASSFAIL($1))
 
 dnl A freeform regression test.  Only exit status is checked.
@@ -41,7 +41,7 @@ dnl A regression test like REGRESSION_TEST, except only regress.out is used
 dnl for checking output differences.  The first argument is the command, the
 dnl second argument (which may be empty) is the test name.
 define(`REGRESSION_TEST_ONE',
-$1 | diff -u regress.out -
+$1 | diff -u ${SRCDIR:-.}/regress.out -
 REGRESSION_PASSFAIL($2))
 
 dnl A fatal error.  This will exit with the given status (first argument) and
diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile
index 00bdd8d..7c65dae 100644
--- a/usr.bin/tr/Makefile
+++ b/usr.bin/tr/Makefile
@@ -1,7 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	tr
 SRCS=	cmap.c cset.c str.c tr.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/tr/tests/Makefile b/usr.bin/tr/tests/Makefile
new file mode 100644
index 0000000..58e4fadc
--- /dev/null
+++ b/usr.bin/tr/tests/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/tr
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.00.out
+FILES+=		regress.01.out
+FILES+=		regress.02.out
+FILES+=		regress.03.out
+FILES+=		regress.04.out
+FILES+=		regress.05.out
+FILES+=		regress.06.out
+FILES+=		regress.07.out
+FILES+=		regress.08.out
+FILES+=		regress.09.out
+FILES+=		regress.0a.out
+FILES+=		regress.0b.out
+FILES+=		regress.0c.out
+FILES+=		regress.0d.out
+FILES+=		regress.in
+FILES+=		regress.sh
+FILES+=		regress2.in
+
+.include <bsd.test.mk>
diff --git a/usr.bin/tr/tests/legacy_test.sh b/usr.bin/tr/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/tr/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/tr/regress.00.out b/usr.bin/tr/tests/regress.00.out
index 5a7d1c7..5a7d1c7 100644
--- a/tools/regression/usr.bin/tr/regress.00.out
+++ b/usr.bin/tr/tests/regress.00.out
diff --git a/tools/regression/usr.bin/tr/regress.01.out b/usr.bin/tr/tests/regress.01.out
index 5252b48..5252b48 100644
--- a/tools/regression/usr.bin/tr/regress.01.out
+++ b/usr.bin/tr/tests/regress.01.out
diff --git a/tools/regression/usr.bin/tr/regress.02.out b/usr.bin/tr/tests/regress.02.out
index 67a6dea..67a6dea 100644
--- a/tools/regression/usr.bin/tr/regress.02.out
+++ b/usr.bin/tr/tests/regress.02.out
diff --git a/tools/regression/usr.bin/tr/regress.03.out b/usr.bin/tr/tests/regress.03.out
index c18e3cf..c18e3cf 100644
--- a/tools/regression/usr.bin/tr/regress.03.out
+++ b/usr.bin/tr/tests/regress.03.out
diff --git a/tools/regression/usr.bin/tr/regress.04.out b/usr.bin/tr/tests/regress.04.out
index c01413c..c01413c 100644
--- a/tools/regression/usr.bin/tr/regress.04.out
+++ b/usr.bin/tr/tests/regress.04.out
diff --git a/tools/regression/usr.bin/tr/regress.05.out b/usr.bin/tr/tests/regress.05.out
index 5252b48..5252b48 100644
--- a/tools/regression/usr.bin/tr/regress.05.out
+++ b/usr.bin/tr/tests/regress.05.out
diff --git a/tools/regression/usr.bin/tr/regress.06.out b/usr.bin/tr/tests/regress.06.out
index 5ca0a4f..5ca0a4f 100644
--- a/tools/regression/usr.bin/tr/regress.06.out
+++ b/usr.bin/tr/tests/regress.06.out
diff --git a/tools/regression/usr.bin/tr/regress.07.out b/usr.bin/tr/tests/regress.07.out
index 999fe47..999fe47 100644
--- a/tools/regression/usr.bin/tr/regress.07.out
+++ b/usr.bin/tr/tests/regress.07.out
diff --git a/tools/regression/usr.bin/tr/regress.08.out b/usr.bin/tr/tests/regress.08.out
index 34abcc1..34abcc1 100644
--- a/tools/regression/usr.bin/tr/regress.08.out
+++ b/usr.bin/tr/tests/regress.08.out
diff --git a/tools/regression/usr.bin/tr/regress.09.out b/usr.bin/tr/tests/regress.09.out
index 2419e3a..2419e3a 100644
--- a/tools/regression/usr.bin/tr/regress.09.out
+++ b/usr.bin/tr/tests/regress.09.out
diff --git a/tools/regression/usr.bin/tr/regress.0a.out b/usr.bin/tr/tests/regress.0a.out
index e703f63..e703f63 100644
--- a/tools/regression/usr.bin/tr/regress.0a.out
+++ b/usr.bin/tr/tests/regress.0a.out
diff --git a/tools/regression/usr.bin/tr/regress.0b.out b/usr.bin/tr/tests/regress.0b.out
index 8d26586..8d26586 100644
--- a/tools/regression/usr.bin/tr/regress.0b.out
+++ b/usr.bin/tr/tests/regress.0b.out
diff --git a/tools/regression/usr.bin/tr/regress.0c.out b/usr.bin/tr/tests/regress.0c.out
index 4e125ea..4e125ea 100644
--- a/tools/regression/usr.bin/tr/regress.0c.out
+++ b/usr.bin/tr/tests/regress.0c.out
diff --git a/tools/regression/usr.bin/tr/regress.0d.out b/usr.bin/tr/tests/regress.0d.out
index 8b13789..8b13789 100644
--- a/tools/regression/usr.bin/tr/regress.0d.out
+++ b/usr.bin/tr/tests/regress.0d.out
diff --git a/tools/regression/usr.bin/tr/regress.in b/usr.bin/tr/tests/regress.in
index 5252b48..5252b48 100644
--- a/tools/regression/usr.bin/tr/regress.in
+++ b/usr.bin/tr/tests/regress.in
diff --git a/usr.bin/tr/tests/regress.sh b/usr.bin/tr/tests/regress.sh
new file mode 100644
index 0000000..682cf23
--- /dev/null
+++ b/usr.bin/tr/tests/regress.sh
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+echo 1..14
+
+REGRESSION_START($1)
+
+REGRESSION_TEST(`00', `tr abcde 12345 <${SRCDIR}/regress.in')
+REGRESSION_TEST(`01', `tr 12345 abcde <${SRCDIR}/regress.in')
+REGRESSION_TEST(`02', `tr -d aceg <${SRCDIR}/regress.in')
+REGRESSION_TEST(`03', `tr "[[:lower:]]" "[[:upper:]]" <${SRCDIR}/regress.in')
+REGRESSION_TEST(`04', `tr "[[:alpha:]]" . <${SRCDIR}/regress.in')
+REGRESSION_TEST(`05', `tr "[[:lower:]]" "[[:upper:]]" <${SRCDIR}/regress.in | tr "[[:upper:]]" "[[:lower:]]"')
+REGRESSION_TEST(`06', `tr "[[:digit:]]" "?" <${SRCDIR}/regress2.in')
+REGRESSION_TEST(`07', `tr "[[:alnum:]]" "#" <${SRCDIR}/regress2.in')
+REGRESSION_TEST(`08', `tr "[[:upper:]]" "[[:lower:]]" <${SRCDIR}/regress2.in | tr -d "[^[:alpha:]] "')
+REGRESSION_TEST(`09', `printf "\\f\\r\\n" | tr "\\014\\r" "?#"')
+REGRESSION_TEST(`0a', `printf "0xdeadbeef\\n" | tr "x[[:xdigit:]]" "?\$"')
+REGRESSION_TEST(`0b', `(tr -cd "[[:xdigit:]]" <${SRCDIR}/regress2.in ; echo)')
+REGRESSION_TEST(`0c', `echo "[[[[]]]]" | tr -d "[=]=]"')
+REGRESSION_TEST(`0d', `echo "]=[" | tr -d "[=]"')
+
+REGRESSION_END()
diff --git a/tools/regression/usr.bin/tr/regress2.in b/usr.bin/tr/tests/regress2.in
index c416463..c416463 100644
--- a/tools/regression/usr.bin/tr/regress2.in
+++ b/usr.bin/tr/tests/regress2.in
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index 909ce3d..f49bb48 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,8 +1,15 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+NO_MAN=
+
+.include <bsd.own.mk>
+
 PROG=	uudecode
 LINKS=	${BINDIR}/uudecode ${BINDIR}/b64decode
-NO_MAN=
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/uudecode/tests/Makefile b/usr.bin/uudecode/tests/Makefile
new file mode 100644
index 0000000..5fda16b
--- /dev/null
+++ b/usr.bin/uudecode/tests/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/uudecode
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.base64.in
+FILES+=		regress.out
+FILES+=		regress.sh
+FILES+=		regress.traditional.in
+
+.include <bsd.test.mk>
diff --git a/usr.bin/uudecode/tests/legacy_test.sh b/usr.bin/uudecode/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/uudecode/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/uudecode/regress.base64.in b/usr.bin/uudecode/tests/regress.base64.in
index 3a8bfc2..3a8bfc2 100644
--- a/tools/regression/usr.bin/uudecode/regress.base64.in
+++ b/usr.bin/uudecode/tests/regress.base64.in
diff --git a/tools/regression/usr.bin/uudecode/regress.out b/usr.bin/uudecode/tests/regress.out
index fa0dd08..fa0dd08 100644
--- a/tools/regression/usr.bin/uudecode/regress.out
+++ b/usr.bin/uudecode/tests/regress.out
diff --git a/usr.bin/uudecode/tests/regress.sh b/usr.bin/uudecode/tests/regress.sh
new file mode 100644
index 0000000..3aeb04d
--- /dev/null
+++ b/usr.bin/uudecode/tests/regress.sh
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+echo 1..2
+
+REGRESSION_START($1)
+
+REGRESSION_TEST_ONE(`uudecode -p <${SRCDIR}/regress.traditional.in', `traditional')
+REGRESSION_TEST_ONE(`uudecode -p <${SRCDIR}/regress.base64.in', `base64')
+
+REGRESSION_END()
diff --git a/tools/regression/usr.bin/uudecode/regress.traditional.in b/usr.bin/uudecode/tests/regress.traditional.in
index da81415..da81415 100644
--- a/tools/regression/usr.bin/uudecode/regress.traditional.in
+++ b/usr.bin/uudecode/tests/regress.traditional.in
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index 9a8b991..9c5e729 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	uuencode
 MAN=	uuencode.1 uuencode.format.5
 LINKS=	${BINDIR}/uuencode ${BINDIR}/b64encode
@@ -9,4 +11,8 @@ MLINKS=	uuencode.1 uudecode.1 \
 	uuencode.1 b64encode.1 \
 	b64encode.1 b64decode.1
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/uuencode/tests/Makefile b/usr.bin/uuencode/tests/Makefile
new file mode 100644
index 0000000..ca7088e
--- /dev/null
+++ b/usr.bin/uuencode/tests/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/uuencode
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.base64.out
+FILES+=		regress.in
+FILES+=		regress.sh
+FILES+=		regress.traditional.out
+
+.include <bsd.test.mk>
diff --git a/usr.bin/uuencode/tests/legacy_test.sh b/usr.bin/uuencode/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/uuencode/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/uuencode/regress.base64.out b/usr.bin/uuencode/tests/regress.base64.out
index 046f6c5..046f6c5 100644
--- a/tools/regression/usr.bin/uuencode/regress.base64.out
+++ b/usr.bin/uuencode/tests/regress.base64.out
diff --git a/tools/regression/usr.bin/uuencode/regress.in b/usr.bin/uuencode/tests/regress.in
index fa0dd08..fa0dd08 100644
--- a/tools/regression/usr.bin/uuencode/regress.in
+++ b/usr.bin/uuencode/tests/regress.in
diff --git a/usr.bin/uuencode/tests/regress.sh b/usr.bin/uuencode/tests/regress.sh
new file mode 100644
index 0000000..6be0ef3
--- /dev/null
+++ b/usr.bin/uuencode/tests/regress.sh
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+echo 1..2
+
+REGRESSION_START($1)
+
+REGRESSION_TEST(`traditional', `uuencode regress.in <${SRCDIR}/regress.in')
+REGRESSION_TEST(`base64', `uuencode -m regress.in <${SRCDIR}/regress.in')
+
+REGRESSION_END()
diff --git a/tools/regression/usr.bin/uuencode/regress.traditional.out b/usr.bin/uuencode/tests/regress.traditional.out
index ee1352f..ee1352f 100644
--- a/tools/regression/usr.bin/uuencode/regress.traditional.out
+++ b/usr.bin/uuencode/tests/regress.traditional.out
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile
index 642e953..b627bf5 100644
--- a/usr.bin/xargs/Makefile
+++ b/usr.bin/xargs/Makefile
@@ -1,7 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	xargs
 SRCS=	xargs.c strnsubst.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/xargs/tests/Makefile b/usr.bin/xargs/tests/Makefile
new file mode 100644
index 0000000..2004d79
--- /dev/null
+++ b/usr.bin/xargs/tests/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/xargs
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.0.in
+FILES+=		regress.0.out
+FILES+=		regress.0I.out
+FILES+=		regress.0J.out
+FILES+=		regress.0L.out
+FILES+=		regress.I.out
+FILES+=		regress.J.out
+FILES+=		regress.L.out
+FILES+=		regress.R.out
+FILES+=		regress.in
+FILES+=		regress.n1.out
+FILES+=		regress.n2.out
+FILES+=		regress.n3.out
+FILES+=		regress.normal.out
+FILES+=		regress.quotes.in
+FILES+=		regress.quotes.out
+FILES+=		regress.sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/xargs/tests/legacy_test.sh b/usr.bin/xargs/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/xargs/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/xargs/regress.0.in b/usr.bin/xargs/tests/regress.0.in
index 448ba53..448ba53 100644
--- a/tools/regression/usr.bin/xargs/regress.0.in
+++ b/usr.bin/xargs/tests/regress.0.in
diff --git a/tools/regression/usr.bin/xargs/regress.0.out b/usr.bin/xargs/tests/regress.0.out
index 2bc9725..2bc9725 100644
--- a/tools/regression/usr.bin/xargs/regress.0.out
+++ b/usr.bin/xargs/tests/regress.0.out
diff --git a/tools/regression/usr.bin/xargs/regress.0I.out b/usr.bin/xargs/tests/regress.0I.out
index 16009c0..16009c0 100644
--- a/tools/regression/usr.bin/xargs/regress.0I.out
+++ b/usr.bin/xargs/tests/regress.0I.out
diff --git a/tools/regression/usr.bin/xargs/regress.0J.out b/usr.bin/xargs/tests/regress.0J.out
index 69c87f9..69c87f9 100644
--- a/tools/regression/usr.bin/xargs/regress.0J.out
+++ b/usr.bin/xargs/tests/regress.0J.out
diff --git a/tools/regression/usr.bin/xargs/regress.0L.out b/usr.bin/xargs/tests/regress.0L.out
index 2d13fcc..2d13fcc 100644
--- a/tools/regression/usr.bin/xargs/regress.0L.out
+++ b/usr.bin/xargs/tests/regress.0L.out
diff --git a/tools/regression/usr.bin/xargs/regress.I.out b/usr.bin/xargs/tests/regress.I.out
index f2a6a1e..f2a6a1e 100644
--- a/tools/regression/usr.bin/xargs/regress.I.out
+++ b/usr.bin/xargs/tests/regress.I.out
diff --git a/tools/regression/usr.bin/xargs/regress.J.out b/usr.bin/xargs/tests/regress.J.out
index b88a41e..b88a41e 100644
--- a/tools/regression/usr.bin/xargs/regress.J.out
+++ b/usr.bin/xargs/tests/regress.J.out
diff --git a/tools/regression/usr.bin/xargs/regress.L.out b/usr.bin/xargs/tests/regress.L.out
index 7359dee..7359dee 100644
--- a/tools/regression/usr.bin/xargs/regress.L.out
+++ b/usr.bin/xargs/tests/regress.L.out
diff --git a/tools/regression/usr.bin/xargs/regress.R.out b/usr.bin/xargs/tests/regress.R.out
index 6fe947f..6fe947f 100644
--- a/tools/regression/usr.bin/xargs/regress.R.out
+++ b/usr.bin/xargs/tests/regress.R.out
diff --git a/tools/regression/usr.bin/xargs/regress.in b/usr.bin/xargs/tests/regress.in
index 5252b48..5252b48 100644
--- a/tools/regression/usr.bin/xargs/regress.in
+++ b/usr.bin/xargs/tests/regress.in
diff --git a/tools/regression/usr.bin/xargs/regress.n1.out b/usr.bin/xargs/tests/regress.n1.out
index 77ef6c5..77ef6c5 100644
--- a/tools/regression/usr.bin/xargs/regress.n1.out
+++ b/usr.bin/xargs/tests/regress.n1.out
diff --git a/tools/regression/usr.bin/xargs/regress.n2.out b/usr.bin/xargs/tests/regress.n2.out
index 4fa3f55..4fa3f55 100644
--- a/tools/regression/usr.bin/xargs/regress.n2.out
+++ b/usr.bin/xargs/tests/regress.n2.out
diff --git a/tools/regression/usr.bin/xargs/regress.n3.out b/usr.bin/xargs/tests/regress.n3.out
index 21b2c1e..21b2c1e 100644
--- a/tools/regression/usr.bin/xargs/regress.n3.out
+++ b/usr.bin/xargs/tests/regress.n3.out
diff --git a/tools/regression/usr.bin/xargs/regress.normal.out b/usr.bin/xargs/tests/regress.normal.out
index 458d9cb..458d9cb 100644
--- a/tools/regression/usr.bin/xargs/regress.normal.out
+++ b/usr.bin/xargs/tests/regress.normal.out
diff --git a/tools/regression/usr.bin/xargs/regress.quotes.in b/usr.bin/xargs/tests/regress.quotes.in
index 11388a0..11388a0 100644
--- a/tools/regression/usr.bin/xargs/regress.quotes.in
+++ b/usr.bin/xargs/tests/regress.quotes.in
diff --git a/tools/regression/usr.bin/xargs/regress.quotes.out b/usr.bin/xargs/tests/regress.quotes.out
index f79ad41..f79ad41 100644
--- a/tools/regression/usr.bin/xargs/regress.quotes.out
+++ b/usr.bin/xargs/tests/regress.quotes.out
diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh
new file mode 100644
index 0000000..316365d
--- /dev/null
+++ b/usr.bin/xargs/tests/regress.sh
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+echo 1..13
+
+REGRESSION_START($1)
+
+REGRESSION_TEST(`normal', `xargs echo The <${SRCDIR}/regress.in')
+REGRESSION_TEST(`I', `xargs -I% echo The % % % %% % % <${SRCDIR}/regress.in')
+REGRESSION_TEST(`J', `xargs -J% echo The % again. <${SRCDIR}/regress.in')
+REGRESSION_TEST(`L', `xargs -L3 echo <${SRCDIR}/regress.in')
+REGRESSION_TEST(`R', `xargs -I% -R1 echo The % % % %% % % <${SRCDIR}/regress.in')
+REGRESSION_TEST(`n1', `xargs -n1 echo <${SRCDIR}/regress.in')
+REGRESSION_TEST(`n2', `xargs -n2 echo <${SRCDIR}/regress.in')
+REGRESSION_TEST(`n3', `xargs -n3 echo <${SRCDIR}/regress.in')
+REGRESSION_TEST(`0', `xargs -0 -n1 echo <${SRCDIR}/regress.0.in')
+REGRESSION_TEST(`0I', `xargs -0 -I% echo The % %% % <${SRCDIR}/regress.0.in')
+REGRESSION_TEST(`0J', `xargs -0 -J% echo The % again. <${SRCDIR}/regress.0.in')
+REGRESSION_TEST(`0L', `xargs -0 -L2 echo <${SRCDIR}/regress.0.in')
+REGRESSION_TEST(`quotes', `xargs -n1 echo <${SRCDIR}/regress.quotes.in')
+
+REGRESSION_END()
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 677486f..25b63a7 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	5.3 (Berkeley) 5/12/90
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../contrib/byacc
 
 PROG=	yacc
@@ -16,4 +18,8 @@ CFLAGS+=	-DMIXEDCASE_FILENAMES=1 \
 LINKS=	${BINDIR}/yacc ${BINDIR}/byacc
 MLINKS=	yacc.1 byacc.1
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/yacc/tests/Makefile b/usr.bin/yacc/tests/Makefile
new file mode 100644
index 0000000..f8b7d85
--- /dev/null
+++ b/usr.bin/yacc/tests/Makefile
@@ -0,0 +1,41 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/yacc
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		calc.y
+FILES+=		calc1.y
+FILES+=		calc2.y
+FILES+=		calc3.y
+FILES+=		code_calc.y
+FILES+=		code_error.y
+FILES+=		error.y
+FILES+=		ftp.y
+FILES+=		grammar.y
+FILES+=		pure_calc.y
+FILES+=		pure_error.y
+FILES+=		quote_calc.y
+FILES+=		quote_calc2.y
+FILES+=		quote_calc3.y
+FILES+=		quote_calc4.y
+FILES+=		regress.00.out
+FILES+=		regress.01.out
+FILES+=		regress.02.out
+FILES+=		regress.03.out
+FILES+=		regress.04.out
+FILES+=		regress.05.out
+FILES+=		regress.06.out
+FILES+=		regress.07.out
+FILES+=		regress.08.out
+FILES+=		regress.09.out
+FILES+=		regress.10.out
+FILES+=		regress.11.out
+FILES+=		regress.12.out
+FILES+=		regress.13.out
+FILES+=		regress.14.out
+FILES+=		regress.sh
+FILES+=		undefined.y
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/yacc/calc.y b/usr.bin/yacc/tests/calc.y
index c2e5a89..c2e5a89 100644
--- a/tools/regression/usr.bin/yacc/calc.y
+++ b/usr.bin/yacc/tests/calc.y
diff --git a/tools/regression/usr.bin/yacc/calc1.y b/usr.bin/yacc/tests/calc1.y
index ec89736..ec89736 100644
--- a/tools/regression/usr.bin/yacc/calc1.y
+++ b/usr.bin/yacc/tests/calc1.y
diff --git a/tools/regression/usr.bin/yacc/calc2.y b/usr.bin/yacc/tests/calc2.y
index e742ff3..e742ff3 100644
--- a/tools/regression/usr.bin/yacc/calc2.y
+++ b/usr.bin/yacc/tests/calc2.y
diff --git a/tools/regression/usr.bin/yacc/calc3.y b/usr.bin/yacc/tests/calc3.y
index 252faa9..252faa9 100644
--- a/tools/regression/usr.bin/yacc/calc3.y
+++ b/usr.bin/yacc/tests/calc3.y
diff --git a/tools/regression/usr.bin/yacc/code_calc.y b/usr.bin/yacc/tests/code_calc.y
index 0a99456..0a99456 100644
--- a/tools/regression/usr.bin/yacc/code_calc.y
+++ b/usr.bin/yacc/tests/code_calc.y
diff --git a/tools/regression/usr.bin/yacc/code_error.y b/usr.bin/yacc/tests/code_error.y
index bb77156..bb77156 100644
--- a/tools/regression/usr.bin/yacc/code_error.y
+++ b/usr.bin/yacc/tests/code_error.y
diff --git a/tools/regression/usr.bin/yacc/error.y b/usr.bin/yacc/tests/error.y
index 673c68d..673c68d 100644
--- a/tools/regression/usr.bin/yacc/error.y
+++ b/usr.bin/yacc/tests/error.y
diff --git a/tools/regression/usr.bin/yacc/ftp.y b/usr.bin/yacc/tests/ftp.y
index 42c210b..42c210b 100644
--- a/tools/regression/usr.bin/yacc/ftp.y
+++ b/usr.bin/yacc/tests/ftp.y
diff --git a/tools/regression/usr.bin/yacc/grammar.y b/usr.bin/yacc/tests/grammar.y
index a2f1883..a2f1883 100644
--- a/tools/regression/usr.bin/yacc/grammar.y
+++ b/usr.bin/yacc/tests/grammar.y
diff --git a/usr.bin/yacc/tests/legacy_test.sh b/usr.bin/yacc/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/yacc/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/tools/regression/usr.bin/yacc/pure_calc.y b/usr.bin/yacc/tests/pure_calc.y
index 3cd0433..3cd0433 100644
--- a/tools/regression/usr.bin/yacc/pure_calc.y
+++ b/usr.bin/yacc/tests/pure_calc.y
diff --git a/tools/regression/usr.bin/yacc/pure_error.y b/usr.bin/yacc/tests/pure_error.y
index fe7a3c3..fe7a3c3 100644
--- a/tools/regression/usr.bin/yacc/pure_error.y
+++ b/usr.bin/yacc/tests/pure_error.y
diff --git a/tools/regression/usr.bin/yacc/quote_calc.y b/usr.bin/yacc/tests/quote_calc.y
index 9304dd8..9304dd8 100644
--- a/tools/regression/usr.bin/yacc/quote_calc.y
+++ b/usr.bin/yacc/tests/quote_calc.y
diff --git a/tools/regression/usr.bin/yacc/quote_calc2.y b/usr.bin/yacc/tests/quote_calc2.y
index ab72a28..ab72a28 100644
--- a/tools/regression/usr.bin/yacc/quote_calc2.y
+++ b/usr.bin/yacc/tests/quote_calc2.y
diff --git a/tools/regression/usr.bin/yacc/quote_calc3.y b/usr.bin/yacc/tests/quote_calc3.y
index 5feeb4a..5feeb4a 100644
--- a/tools/regression/usr.bin/yacc/quote_calc3.y
+++ b/usr.bin/yacc/tests/quote_calc3.y
diff --git a/tools/regression/usr.bin/yacc/quote_calc4.y b/usr.bin/yacc/tests/quote_calc4.y
index 34b790e..34b790e 100644
--- a/tools/regression/usr.bin/yacc/quote_calc4.y
+++ b/usr.bin/yacc/tests/quote_calc4.y
diff --git a/tools/regression/usr.bin/yacc/regress.00.out b/usr.bin/yacc/tests/regress.00.out
index 39a8ca2..39a8ca2 100644
--- a/tools/regression/usr.bin/yacc/regress.00.out
+++ b/usr.bin/yacc/tests/regress.00.out
diff --git a/tools/regression/usr.bin/yacc/regress.01.out b/usr.bin/yacc/tests/regress.01.out
index 8187502..8187502 100644
--- a/tools/regression/usr.bin/yacc/regress.01.out
+++ b/usr.bin/yacc/tests/regress.01.out
diff --git a/tools/regression/usr.bin/yacc/regress.02.out b/usr.bin/yacc/tests/regress.02.out
index 30de536..30de536 100644
--- a/tools/regression/usr.bin/yacc/regress.02.out
+++ b/usr.bin/yacc/tests/regress.02.out
diff --git a/tools/regression/usr.bin/yacc/regress.03.out b/usr.bin/yacc/tests/regress.03.out
index a8c9f8c..a8c9f8c 100644
--- a/tools/regression/usr.bin/yacc/regress.03.out
+++ b/usr.bin/yacc/tests/regress.03.out
diff --git a/tools/regression/usr.bin/yacc/regress.04.out b/usr.bin/yacc/tests/regress.04.out
index cd93e86..cd93e86 100644
--- a/tools/regression/usr.bin/yacc/regress.04.out
+++ b/usr.bin/yacc/tests/regress.04.out
diff --git a/tools/regression/usr.bin/yacc/regress.05.out b/usr.bin/yacc/tests/regress.05.out
index 2fbf0d9..2fbf0d9 100644
--- a/tools/regression/usr.bin/yacc/regress.05.out
+++ b/usr.bin/yacc/tests/regress.05.out
diff --git a/tools/regression/usr.bin/yacc/regress.06.out b/usr.bin/yacc/tests/regress.06.out
index d2305e1..d2305e1 100644
--- a/tools/regression/usr.bin/yacc/regress.06.out
+++ b/usr.bin/yacc/tests/regress.06.out
diff --git a/tools/regression/usr.bin/yacc/regress.07.out b/usr.bin/yacc/tests/regress.07.out
index ae185a0..ae185a0 100644
--- a/tools/regression/usr.bin/yacc/regress.07.out
+++ b/usr.bin/yacc/tests/regress.07.out
diff --git a/tools/regression/usr.bin/yacc/regress.08.out b/usr.bin/yacc/tests/regress.08.out
index d5d3ae0..d5d3ae0 100644
--- a/tools/regression/usr.bin/yacc/regress.08.out
+++ b/usr.bin/yacc/tests/regress.08.out
diff --git a/tools/regression/usr.bin/yacc/regress.09.out b/usr.bin/yacc/tests/regress.09.out
index b6c13e2..b6c13e2 100644
--- a/tools/regression/usr.bin/yacc/regress.09.out
+++ b/usr.bin/yacc/tests/regress.09.out
diff --git a/tools/regression/usr.bin/yacc/regress.10.out b/usr.bin/yacc/tests/regress.10.out
index f4a5ba4..f4a5ba4 100644
--- a/tools/regression/usr.bin/yacc/regress.10.out
+++ b/usr.bin/yacc/tests/regress.10.out
diff --git a/tools/regression/usr.bin/yacc/regress.11.out b/usr.bin/yacc/tests/regress.11.out
index 8668971..8668971 100644
--- a/tools/regression/usr.bin/yacc/regress.11.out
+++ b/usr.bin/yacc/tests/regress.11.out
diff --git a/tools/regression/usr.bin/yacc/regress.12.out b/usr.bin/yacc/tests/regress.12.out
index 757c977..757c977 100644
--- a/tools/regression/usr.bin/yacc/regress.12.out
+++ b/usr.bin/yacc/tests/regress.12.out
diff --git a/tools/regression/usr.bin/yacc/regress.13.out b/usr.bin/yacc/tests/regress.13.out
index 94b717e..94b717e 100644
--- a/tools/regression/usr.bin/yacc/regress.13.out
+++ b/usr.bin/yacc/tests/regress.13.out
diff --git a/tools/regression/usr.bin/yacc/regress.14.out b/usr.bin/yacc/tests/regress.14.out
index aecfb49..aecfb49 100644
--- a/tools/regression/usr.bin/yacc/regress.14.out
+++ b/usr.bin/yacc/tests/regress.14.out
diff --git a/usr.bin/yacc/tests/regress.sh b/usr.bin/yacc/tests/regress.sh
new file mode 100644
index 0000000..fb3b5a5
--- /dev/null
+++ b/usr.bin/yacc/tests/regress.sh
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+echo 1..15
+
+test_yacc() {
+	yacc "${@}" | sed -e "s,${SRCDIR}/,,g"
+}
+
+REGRESSION_START($1)
+
+REGRESSION_TEST(`00', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/undefined.y')
+REGRESSION_TEST(`01', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/calc.y')
+REGRESSION_TEST(`02', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/calc1.y')
+REGRESSION_TEST(`03', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/calc3.y')
+REGRESSION_TEST(`04', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/code_calc.y')
+REGRESSION_TEST(`05', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/code_error.y')
+REGRESSION_TEST(`06', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/error.y')
+REGRESSION_TEST(`07', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/ftp.y')
+REGRESSION_TEST(`08', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/grammar.y')
+REGRESSION_TEST(`09', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/pure_calc.y')
+REGRESSION_TEST(`10', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/pure_error.y')
+REGRESSION_TEST(`11', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/quote_calc.y')
+REGRESSION_TEST(`12', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/quote_calc2.y')
+REGRESSION_TEST(`13', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/quote_calc3.y')
+REGRESSION_TEST(`14', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/quote_calc4.y')
+
+REGRESSION_END()
+
diff --git a/tools/regression/usr.bin/yacc/undefined.y b/usr.bin/yacc/tests/undefined.y
index 33ba005..33ba005 100644
--- a/tools/regression/usr.bin/yacc/undefined.y
+++ b/usr.bin/yacc/tests/undefined.y
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index f809688..7c5a07d 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -292,6 +292,10 @@ SUBDIR+=	praliases
 SUBDIR+=	sendmail
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .if ${MK_TOOLCHAIN} != "no"
 SUBDIR+=	config
 SUBDIR+=	crunch
diff --git a/usr.sbin/etcupdate/Makefile b/usr.sbin/etcupdate/Makefile
index 9f6d17e..765533a 100644
--- a/usr.sbin/etcupdate/Makefile
+++ b/usr.sbin/etcupdate/Makefile
@@ -1,6 +1,12 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SCRIPTS=etcupdate.sh
 MAN=	etcupdate.8
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile
new file mode 100644
index 0000000..da83397
--- /dev/null
+++ b/usr.sbin/etcupdate/tests/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.sbin/etcupdate
+
+PLAIN_TESTS_SH=
+.for test in	always_test \
+		conflicts_test \
+		fbsdid_test \
+		ignore_test \
+		preworld_test \
+		tests_test \
+		tzsetup_test
+PLAIN_TESTS_SH+=	${test}
+TEST_METADATA.${test}+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.sbin/etcupdate/always.sh b/usr.sbin/etcupdate/tests/always_test.sh
index 514481e..514481e 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/always.sh
+++ b/usr.sbin/etcupdate/tests/always_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/conflicts.sh b/usr.sbin/etcupdate/tests/conflicts_test.sh
index 816c180..816c180 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/conflicts.sh
+++ b/usr.sbin/etcupdate/tests/conflicts_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/fbsdid.sh b/usr.sbin/etcupdate/tests/fbsdid_test.sh
index c062c06..c062c06 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/fbsdid.sh
+++ b/usr.sbin/etcupdate/tests/fbsdid_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/ignore.sh b/usr.sbin/etcupdate/tests/ignore_test.sh
index 2d3d2f5..2d3d2f5 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/ignore.sh
+++ b/usr.sbin/etcupdate/tests/ignore_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/preworld.sh b/usr.sbin/etcupdate/tests/preworld_test.sh
index c731293..c731293 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/preworld.sh
+++ b/usr.sbin/etcupdate/tests/preworld_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/tests.sh b/usr.sbin/etcupdate/tests/tests_test.sh
index b99bbef..b99bbef 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/tests.sh
+++ b/usr.sbin/etcupdate/tests/tests_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/tzsetup.sh b/usr.sbin/etcupdate/tests/tzsetup_test.sh
index b102938..b102938 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/tzsetup.sh
+++ b/usr.sbin/etcupdate/tests/tzsetup_test.sh
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index ebc297b..4e3ae55 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -1,7 +1,13 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	newsyslog
 MAN=	newsyslog.8 newsyslog.conf.5
 SRCS=	newsyslog.c ptimes.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/newsyslog/tests/Makefile b/usr.sbin/newsyslog/tests/Makefile
new file mode 100644
index 0000000..f8ad273
--- /dev/null
+++ b/usr.sbin/newsyslog/tests/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.sbin/newsyslog
+
+TAP_TESTS_SH=	legacy_test
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.sbin/newsyslog/regress.sh b/usr.sbin/newsyslog/tests/legacy_test.sh
index 70c4240..ba10f2c 100755..100644
--- a/tools/regression/usr.sbin/newsyslog/regress.sh
+++ b/usr.sbin/newsyslog/tests/legacy_test.sh
@@ -3,7 +3,7 @@
 # $FreeBSD$
 
 COUNT=0
-TMPDIR=`mktemp -d -t regress_newsyslog`
+TMPDIR=$(pwd)/work
 if [ $? -ne 0 ]; then
         echo "$0: Can't create temp dir, exiting..."
         exit 1
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 0adf1f8..23f9bf2 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../usr.bin/lastcomm
 
 PROG=	sa
 MAN=	sa.8
 SRCS=	main.c db.c pdb.c usrdb.c readrec.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile
new file mode 100644
index 0000000..204b510
--- /dev/null
+++ b/usr.sbin/sa/tests/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.sbin/sa
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		v1-amd64-sav.in
+FILES+=		v1-amd64-sav.out
+FILES+=		v1-amd64-u.out
+FILES+=		v1-amd64-usr.in
+FILES+=		v1-amd64-usr.out
+FILES+=		v1-i386-sav.in
+FILES+=		v1-i386-sav.out
+FILES+=		v1-i386-u.out
+FILES+=		v1-i386-usr.in
+FILES+=		v1-i386-usr.out
+FILES+=		v1-sparc64-sav.in
+FILES+=		v1-sparc64-sav.out
+FILES+=		v1-sparc64-u.out
+FILES+=		v1-sparc64-usr.in
+FILES+=		v1-sparc64-usr.out
+FILES+=		v2-amd64-sav.in
+FILES+=		v2-amd64-u.out
+FILES+=		v2-amd64-usr.in
+FILES+=		v2-i386-sav.in
+FILES+=		v2-i386-u.out
+FILES+=		v2-i386-usr.in
+FILES+=		v2-sparc64-sav.in
+FILES+=		v2-sparc64-u.out
+FILES+=		v2-sparc64-usr.in
+
+.include <bsd.test.mk>
diff --git a/usr.sbin/sa/tests/legacy_test.sh b/usr.sbin/sa/tests/legacy_test.sh
new file mode 100644
index 0000000..d0d8f42
--- /dev/null
+++ b/usr.sbin/sa/tests/legacy_test.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+DIR=`dirname $0`
+LCDIR=`dirname $0`/../../usr.bin/lastcomm
+ARCH=`uname -m`
+
+collapse_whitespace()
+{
+	sed -E 's,[ 	]+, ,g'
+}
+
+check()
+{
+	NUM=$1
+	shift
+	collapse_whitespace | \
+	if diff -q - $1
+	then
+		echo "ok $NUM"
+	else
+		echo "not ok $NUM"
+	fi
+}
+
+install -c -m 644 $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in
+install -c -m 644 $LCDIR/v2-$ARCH-acct.in v2-$ARCH-acct.in
+
+echo 1..13
+
+# Command listings of the two acct versions
+sa -u v1-$ARCH-acct.in | check 1 $DIR/v1-$ARCH-u.out
+sa -u v2-$ARCH-acct.in | check 2 $DIR/v2-$ARCH-u.out
+
+# Plain summaries of user/process
+sa -i v1-$ARCH-acct.in | check 3 $DIR/v1-$ARCH-sav.out
+sa -im v1-$ARCH-acct.in | check 4 $DIR/v1-$ARCH-usr.out
+
+# Backward compatibility of v1 summary files
+sa -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null |
+	check 5 $DIR/v1-$ARCH-sav.out
+sa -m -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null |
+	check 6 $DIR/v1-$ARCH-usr.out
+
+# Convert old summary format to new 
+install -c -m 644 $DIR/v1-$ARCH-sav.in v2c-$ARCH-sav.in
+install -c -m 644 $DIR/v1-$ARCH-usr.in v2c-$ARCH-usr.in
+sa -s -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null >/dev/null
+sa -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null |
+	check 7 $DIR/v1-$ARCH-sav.out
+sa -m -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null |
+	check 8 $DIR/v1-$ARCH-usr.out
+
+# Reading v2 summary files
+sa -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null |
+	check 9 $DIR/v1-$ARCH-sav.out
+sa -m -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null |
+	check 10 $DIR/v1-$ARCH-usr.out
+
+# Summarize
+sa -is -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in v1-$ARCH-acct.in >/dev/null
+sa -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null |
+	check 11 $DIR/v1-$ARCH-sav.out
+sa -m -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null |
+	check 12 $DIR/v1-$ARCH-usr.out
+
+# Accumulate
+install -c -m 644 $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in
+sa -is -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in v1-$ARCH-acct.in >/dev/null
+install -c -m 644 $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in
+sa -s -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in v1-$ARCH-acct.in \
+    | collapse_whitespace >double
+cp $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in
+sa -i v1-$ARCH-acct.in v1-$ARCH-acct.in | check 13 double
+
+exit 0
diff --git a/tools/regression/usr.sbin/sa/prime.sh b/usr.sbin/sa/tests/prime.sh
index c3fec32..6992f45 100644..100755
--- a/tools/regression/usr.sbin/sa/prime.sh
+++ b/usr.sbin/sa/tests/prime.sh
@@ -6,6 +6,8 @@
 # $FreeBSD$
 #
 
+TZ=UTC; export TZ
+
 # Set this to the path of the current sa command
 SANEW=/usr/sbin/sa
 
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-sav.in b/usr.sbin/sa/tests/v1-amd64-sav.in
index adc38dd..adc38dd 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-sav.in
+++ b/usr.sbin/sa/tests/v1-amd64-sav.in
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-sav.out b/usr.sbin/sa/tests/v1-amd64-sav.out
index a2289ee..a2289ee 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-sav.out
+++ b/usr.sbin/sa/tests/v1-amd64-sav.out
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-u.out b/usr.sbin/sa/tests/v1-amd64-u.out
index 4c13b76..4c13b76 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-u.out
+++ b/usr.sbin/sa/tests/v1-amd64-u.out
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-usr.in b/usr.sbin/sa/tests/v1-amd64-usr.in
index 6896d32..6896d32 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-usr.in
+++ b/usr.sbin/sa/tests/v1-amd64-usr.in
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-usr.out b/usr.sbin/sa/tests/v1-amd64-usr.out
index 2282808..2282808 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-usr.out
+++ b/usr.sbin/sa/tests/v1-amd64-usr.out
diff --git a/tools/regression/usr.sbin/sa/v1-i386-sav.in b/usr.sbin/sa/tests/v1-i386-sav.in
index 4ed7aef..4ed7aef 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-sav.in
+++ b/usr.sbin/sa/tests/v1-i386-sav.in
diff --git a/tools/regression/usr.sbin/sa/v1-i386-sav.out b/usr.sbin/sa/tests/v1-i386-sav.out
index a8d68b1..a8d68b1 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-sav.out
+++ b/usr.sbin/sa/tests/v1-i386-sav.out
diff --git a/tools/regression/usr.sbin/sa/v1-i386-u.out b/usr.sbin/sa/tests/v1-i386-u.out
index 17c28be..17c28be 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-u.out
+++ b/usr.sbin/sa/tests/v1-i386-u.out
diff --git a/tools/regression/usr.sbin/sa/v1-i386-usr.in b/usr.sbin/sa/tests/v1-i386-usr.in
index 791b6ed..791b6ed 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-usr.in
+++ b/usr.sbin/sa/tests/v1-i386-usr.in
diff --git a/tools/regression/usr.sbin/sa/v1-i386-usr.out b/usr.sbin/sa/tests/v1-i386-usr.out
index cf9e7bd..cf9e7bd 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-usr.out
+++ b/usr.sbin/sa/tests/v1-i386-usr.out
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-sav.in b/usr.sbin/sa/tests/v1-sparc64-sav.in
index d6911cf..d6911cf 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-sav.in
+++ b/usr.sbin/sa/tests/v1-sparc64-sav.in
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-sav.out b/usr.sbin/sa/tests/v1-sparc64-sav.out
index 1905420..1905420 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-sav.out
+++ b/usr.sbin/sa/tests/v1-sparc64-sav.out
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-u.out b/usr.sbin/sa/tests/v1-sparc64-u.out
index d0ecb51..d0ecb51 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-u.out
+++ b/usr.sbin/sa/tests/v1-sparc64-u.out
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-usr.in b/usr.sbin/sa/tests/v1-sparc64-usr.in
index 08d795b..08d795b 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-usr.in
+++ b/usr.sbin/sa/tests/v1-sparc64-usr.in
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-usr.out b/usr.sbin/sa/tests/v1-sparc64-usr.out
index cab001f..cab001f 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-usr.out
+++ b/usr.sbin/sa/tests/v1-sparc64-usr.out
diff --git a/tools/regression/usr.sbin/sa/v2-amd64-sav.in b/usr.sbin/sa/tests/v2-amd64-sav.in
index 24f863b..24f863b 100644
--- a/tools/regression/usr.sbin/sa/v2-amd64-sav.in
+++ b/usr.sbin/sa/tests/v2-amd64-sav.in
diff --git a/tools/regression/usr.sbin/sa/v2-amd64-u.out b/usr.sbin/sa/tests/v2-amd64-u.out
index 4196f4a..4196f4a 100644
--- a/tools/regression/usr.sbin/sa/v2-amd64-u.out
+++ b/usr.sbin/sa/tests/v2-amd64-u.out
diff --git a/tools/regression/usr.sbin/sa/v2-amd64-usr.in b/usr.sbin/sa/tests/v2-amd64-usr.in
index 4c3b136..4c3b136 100644
--- a/tools/regression/usr.sbin/sa/v2-amd64-usr.in
+++ b/usr.sbin/sa/tests/v2-amd64-usr.in
diff --git a/tools/regression/usr.sbin/sa/v2-i386-sav.in b/usr.sbin/sa/tests/v2-i386-sav.in
index d3172db..d3172db 100644
--- a/tools/regression/usr.sbin/sa/v2-i386-sav.in
+++ b/usr.sbin/sa/tests/v2-i386-sav.in
diff --git a/tools/regression/usr.sbin/sa/v2-i386-u.out b/usr.sbin/sa/tests/v2-i386-u.out
index b553eb8..b553eb8 100644
--- a/tools/regression/usr.sbin/sa/v2-i386-u.out
+++ b/usr.sbin/sa/tests/v2-i386-u.out
diff --git a/tools/regression/usr.sbin/sa/v2-i386-usr.in b/usr.sbin/sa/tests/v2-i386-usr.in
index 465fdb4..465fdb4 100644
--- a/tools/regression/usr.sbin/sa/v2-i386-usr.in
+++ b/usr.sbin/sa/tests/v2-i386-usr.in
diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-sav.in b/usr.sbin/sa/tests/v2-sparc64-sav.in
index b6d836a..b6d836a 100644
--- a/tools/regression/usr.sbin/sa/v2-sparc64-sav.in
+++ b/usr.sbin/sa/tests/v2-sparc64-sav.in
diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-u.out b/usr.sbin/sa/tests/v2-sparc64-u.out
index 9339238..9339238 100644
--- a/tools/regression/usr.sbin/sa/v2-sparc64-u.out
+++ b/usr.sbin/sa/tests/v2-sparc64-u.out
diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-usr.in b/usr.sbin/sa/tests/v2-sparc64-usr.in
index 01a1bdc..01a1bdc 100644
--- a/tools/regression/usr.sbin/sa/v2-sparc64-usr.in
+++ b/usr.sbin/sa/tests/v2-sparc64-usr.in
diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile
new file mode 100644
index 0000000..a7e9c71
--- /dev/null
+++ b/usr.sbin/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.sbin
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
author	jmmv <jmmv@FreeBSD.org>	2014-04-27 01:15:10 +0000
committer	jmmv <jmmv@FreeBSD.org>	2014-04-27 01:15:10 +0000
commit	1e4589b921fdaa1b1d2fc6b6ed016f1e0a01cb8f (patch)
tree	94c86cf13dedabad5bdc68f6f227b843a5161343
parent	5b12da65bf9d40526ac9ca480d639bad3cd39cf6 (diff)
download	FreeBSD-src-1e4589b921fdaa1b1d2fc6b6ed016f1e0a01cb8f.zip FreeBSD-src-1e4589b921fdaa1b1d2fc6b6ed016f1e0a01cb8f.tar.gz