Migrate most of tools/regression/usr.bin/ to the new tests layout.

I'm starting with the easy cases.  The leftovers need to be looked at a
bit more closely.

Note that this change _does_ modify the code of the old tests.  This is
required in order to allow the code to locate the data files in the
source directory instead of the current directory, because Kyua
automatically changes the latter to a temporary directory.

Also note that at least one test is known to be broken here.  Actually,
the test is not really broken: it's marked as a TODO but unfortunately
Kyua's TAP parser currently does not understand that.  Will have to be
fixed separately.

587 files changed, 1047 insertions, 349 deletions

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 6bfbb9d..9dbcb50 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -91,12 +91,44 @@
             ..
         ..
         usr.bin
+            apply
+            ..
             atf
                 atf-sh
                 ..
             ..
+            calendar
+            ..
+            comm
+            ..
+            file2c
+            ..
+            join
+            ..
+            jot
+            ..
             lastcomm
             ..
+            m4
+            ..
+            ncal
+            ..
+            printf
+            ..
+            sed
+	    	regress.multitest.out
+		..
+            ..
+            tr
+            ..
+            uudecode
+            ..
+            uuencode
+            ..
+            xargs
+            ..
+            yacc
+            ..
         ..
         usr.sbin
             etcupdate
diff --git a/tools/regression/usr.bin/Makefile b/tools/regression/usr.bin/Makefile
deleted file mode 100644
index 2365e3a..0000000
--- a/tools/regression/usr.bin/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	apply calendar comm file2c join jot m4 ncal printf sed tr	\
-	uudecode uuencode xargs
-
-.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/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/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/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/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/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..8adbaa7
--- /dev/null
+++ b/usr.bin/sed/tests/Makefile
@@ -0,0 +1,38 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/sed
+
+TAP_TESTS_SH=	legacy_test
+TAP_TESTS_SH+=	multi_test
+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 a5f0d1b..f4e548c 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>
+
 BYACC_SRC=	${.CURDIR}/../../contrib/byacc
 .PATH: ${BYACC_SRC}
 
@@ -20,4 +22,8 @@ CFLAGS+=	-DYYPATCH=${YYPATCH}
 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