325 files changed, 93 insertions, 92 deletions

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 2e6d30a..083054e 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -133,21 +133,7 @@
                 atf-sh
                 ..
             ..
-            calendar
-            ..
-            comm
-            ..
-            file2c
-            ..
-            join
-            ..
-            jot
-            ..
-            lastcomm
-            ..
-            m4
-            ..
-            make
+            bmake
                 archives
                     fmt_44bsd
                     ..
@@ -245,6 +231,20 @@
                     ..
                 ..
             ..
+            calendar
+            ..
+            comm
+            ..
+            file2c
+            ..
+            join
+            ..
+            jot
+            ..
+            lastcomm
+            ..
+            m4
+            ..
             ncal
             ..
             printf
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index 4d8fa38..df5ae4b 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -3,6 +3,7 @@
 #
 # $FreeBSD$
 
+.include <src.opts.mk>
 .sinclude "Makefile.inc"
 
 SRCTOP?= ${.CURDIR:H:H}
@@ -106,6 +107,10 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}
 SUBDIR+= unit-tests
 .endif
 
+.if ${MK_TESTS} != no
+SUBDIR+= tests
+.endif
+
 
 MAN= ${PROG}.1
 MAN1= ${MAN}
diff --git a/usr.bin/make/tests/Makefile b/usr.bin/bmake/tests/Makefile
index d5bad60..e225034 100644
--- a/usr.bin/make/tests/Makefile
+++ b/usr.bin/bmake/tests/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake
 
 FILESDIR=	${TESTSDIR}
 FILES=		common.sh
diff --git a/usr.bin/make/tests/README b/usr.bin/bmake/tests/README
index 1ac209b..1ac209b 100644
--- a/usr.bin/make/tests/README
+++ b/usr.bin/bmake/tests/README
diff --git a/usr.bin/make/tests/archives/Makefile b/usr.bin/bmake/tests/archives/Makefile
index f8944e0..f80ffc2 100644
--- a/usr.bin/make/tests/archives/Makefile
+++ b/usr.bin/bmake/tests/archives/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives
 
 TESTS_SUBDIRS=	fmt_44bsd fmt_44bsd_mod fmt_oldbsd
 
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
index ab1c383..15389c8 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_oldbsd
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile.test
index 5a8b065..5a8b065 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile.test
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.3
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.4
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.5
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.6
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.7
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.3
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.4
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.5
index 7b91643..7b91643 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.6
index fd15190..fd15190 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.7
index cb572e1..cb572e1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.3
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.4
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.5
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.6
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.7
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh b/usr.bin/bmake/tests/archives/fmt_44bsd/legacy_test.sh
index 2604c96..2604c96 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/legacy_test.sh
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/libtest.a b/usr.bin/bmake/tests/archives/fmt_44bsd/libtest.a
index 891ce6e..891ce6e 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/libtest.a
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/libtest.a
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
index 8d63b64..1d2f6e2 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd_mod
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile.test
index cd999da..cd999da 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile.test
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.3
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.4
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.5
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.6
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.7
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.3
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.4
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.5
index 7b91643..7b91643 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.6
index fd15190..fd15190 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.7
index cb572e1..cb572e1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.3
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.4
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.5
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.6
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.7
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/legacy_test.sh
index bf13f22..bf13f22 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/legacy_test.sh
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/libtest.a
index 57bc407..57bc407 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/libtest.a
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/Makefile b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
index bf6ad40..2a96124 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile.test
index b8f5116..b8f5116 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile.test
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.1
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.2
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.3
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.3
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.4
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.4
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.5
index 573541a..573541a 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.5
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.6
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.6
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.7
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.7
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.1
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.2
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.3
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.3
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.4
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.4
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.5
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.5
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.6
index fd15190..fd15190 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.6
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.7
index cb572e1..cb572e1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.7
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.1
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.2
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.3
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.3
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.4
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.4
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.5
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.5
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.6
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.6
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.7
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.7
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh b/usr.bin/bmake/tests/archives/fmt_oldbsd/legacy_test.sh
index c7980c5..c7980c5 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/legacy_test.sh
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a b/usr.bin/bmake/tests/archives/fmt_oldbsd/libtest.a
index 3434c53..3434c53 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/libtest.a
diff --git a/usr.bin/make/tests/basic/Makefile b/usr.bin/bmake/tests/basic/Makefile
index fd7044e..56dfb33 100644
--- a/usr.bin/make/tests/basic/Makefile
+++ b/usr.bin/bmake/tests/basic/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic
 
 TESTS_SUBDIRS=	t0 t1 t2 t3
 
diff --git a/usr.bin/make/tests/basic/t3/Makefile b/usr.bin/bmake/tests/basic/t0/Makefile
index 00c3757..1235659 100644
--- a/usr.bin/make/tests/basic/t3/Makefile
+++ b/usr.bin/bmake/tests/basic/t0/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t3
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t0
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/basic/t0/expected.status.1 b/usr.bin/bmake/tests/basic/t0/expected.status.1
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/basic/t0/expected.status.1
+++ b/usr.bin/bmake/tests/basic/t0/expected.status.1
diff --git a/usr.bin/make/tests/basic/t0/expected.stderr.1 b/usr.bin/bmake/tests/basic/t0/expected.stderr.1
index 90280c8..90280c8 100644
--- a/usr.bin/make/tests/basic/t0/expected.stderr.1
+++ b/usr.bin/bmake/tests/basic/t0/expected.stderr.1
diff --git a/usr.bin/make/tests/basic/t0/expected.stdout.1 b/usr.bin/bmake/tests/basic/t0/expected.stdout.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/basic/t0/expected.stdout.1
+++ b/usr.bin/bmake/tests/basic/t0/expected.stdout.1
diff --git a/usr.bin/make/tests/basic/t0/legacy_test.sh b/usr.bin/bmake/tests/basic/t0/legacy_test.sh
index d23418a..d23418a 100644
--- a/usr.bin/make/tests/basic/t0/legacy_test.sh
+++ b/usr.bin/bmake/tests/basic/t0/legacy_test.sh
diff --git a/usr.bin/make/tests/basic/t2/Makefile b/usr.bin/bmake/tests/basic/t1/Makefile
index 4b598ea..732dc65 100644
--- a/usr.bin/make/tests/basic/t2/Makefile
+++ b/usr.bin/bmake/tests/basic/t1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/basic/t1/Makefile.test b/usr.bin/bmake/tests/basic/t1/Makefile.test
index d120087..d120087 100644
--- a/usr.bin/make/tests/basic/t1/Makefile.test
+++ b/usr.bin/bmake/tests/basic/t1/Makefile.test
diff --git a/usr.bin/make/tests/basic/t1/expected.status.1 b/usr.bin/bmake/tests/basic/t1/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/basic/t1/expected.status.1
+++ b/usr.bin/bmake/tests/basic/t1/expected.status.1
diff --git a/usr.bin/make/tests/basic/t1/expected.stderr.1 b/usr.bin/bmake/tests/basic/t1/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/basic/t1/expected.stderr.1
+++ b/usr.bin/bmake/tests/basic/t1/expected.stderr.1
diff --git a/usr.bin/make/tests/basic/t1/expected.stdout.1 b/usr.bin/bmake/tests/basic/t1/expected.stdout.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/basic/t1/expected.stdout.1
+++ b/usr.bin/bmake/tests/basic/t1/expected.stdout.1
diff --git a/usr.bin/make/tests/basic/t1/legacy_test.sh b/usr.bin/bmake/tests/basic/t1/legacy_test.sh
index b07f927..b07f927 100644
--- a/usr.bin/make/tests/basic/t1/legacy_test.sh
+++ b/usr.bin/bmake/tests/basic/t1/legacy_test.sh
diff --git a/usr.bin/make/tests/basic/t1/Makefile b/usr.bin/bmake/tests/basic/t2/Makefile
index efd9030..58c36ff 100644
--- a/usr.bin/make/tests/basic/t1/Makefile
+++ b/usr.bin/bmake/tests/basic/t2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t2
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/basic/t2/Makefile.test b/usr.bin/bmake/tests/basic/t2/Makefile.test
index ab8fe49..ab8fe49 100644
--- a/usr.bin/make/tests/basic/t2/Makefile.test
+++ b/usr.bin/bmake/tests/basic/t2/Makefile.test
diff --git a/usr.bin/make/tests/basic/t2/expected.status.1 b/usr.bin/bmake/tests/basic/t2/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/basic/t2/expected.status.1
+++ b/usr.bin/bmake/tests/basic/t2/expected.status.1
diff --git a/usr.bin/make/tests/basic/t2/expected.stderr.1 b/usr.bin/bmake/tests/basic/t2/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/basic/t2/expected.stderr.1
+++ b/usr.bin/bmake/tests/basic/t2/expected.stderr.1
diff --git a/usr.bin/make/tests/basic/t2/expected.stdout.1 b/usr.bin/bmake/tests/basic/t2/expected.stdout.1
index e618540..e618540 100644
--- a/usr.bin/make/tests/basic/t2/expected.stdout.1
+++ b/usr.bin/bmake/tests/basic/t2/expected.stdout.1
diff --git a/usr.bin/make/tests/basic/t2/legacy_test.sh b/usr.bin/bmake/tests/basic/t2/legacy_test.sh
index da4c60a..da4c60a 100644
--- a/usr.bin/make/tests/basic/t2/legacy_test.sh
+++ b/usr.bin/bmake/tests/basic/t2/legacy_test.sh
diff --git a/usr.bin/make/tests/basic/t0/Makefile b/usr.bin/bmake/tests/basic/t3/Makefile
index ef390dd..a173414 100644
--- a/usr.bin/make/tests/basic/t0/Makefile
+++ b/usr.bin/bmake/tests/basic/t3/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t3
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/basic/t3/expected.status.1 b/usr.bin/bmake/tests/basic/t3/expected.status.1
index 0cfbf08..0cfbf08 100644
--- a/usr.bin/make/tests/basic/t3/expected.status.1
+++ b/usr.bin/bmake/tests/basic/t3/expected.status.1
diff --git a/usr.bin/make/tests/basic/t3/expected.stderr.1 b/usr.bin/bmake/tests/basic/t3/expected.stderr.1
index 90280c8..90280c8 100644
--- a/usr.bin/make/tests/basic/t3/expected.stderr.1
+++ b/usr.bin/bmake/tests/basic/t3/expected.stderr.1
diff --git a/usr.bin/make/tests/basic/t3/expected.stdout.1 b/usr.bin/bmake/tests/basic/t3/expected.stdout.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/basic/t3/expected.stdout.1
+++ b/usr.bin/bmake/tests/basic/t3/expected.stdout.1
diff --git a/usr.bin/make/tests/basic/t3/legacy_test.sh b/usr.bin/bmake/tests/basic/t3/legacy_test.sh
index 3c41bb3..3c41bb3 100644
--- a/usr.bin/make/tests/basic/t3/legacy_test.sh
+++ b/usr.bin/bmake/tests/basic/t3/legacy_test.sh
diff --git a/usr.bin/make/tests/common.sh b/usr.bin/bmake/tests/common.sh
index 5c5df1e..5c5df1e 100644
--- a/usr.bin/make/tests/common.sh
+++ b/usr.bin/bmake/tests/common.sh
diff --git a/usr.bin/make/tests/execution/Makefile b/usr.bin/bmake/tests/execution/Makefile
index 52ba9b7..2c91bbb 100644
--- a/usr.bin/make/tests/execution/Makefile
+++ b/usr.bin/bmake/tests/execution/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution
 
 TESTS_SUBDIRS=	ellipsis empty joberr plus
 
diff --git a/usr.bin/make/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile
index 7f3dc3e..5629b4b 100644
--- a/usr.bin/make/tests/execution/ellipsis/Makefile
+++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/ellipsis
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/ellipsis
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/execution/ellipsis/Makefile.test b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test
index d19f642..d19f642 100644
--- a/usr.bin/make/tests/execution/ellipsis/Makefile.test
+++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test
diff --git a/usr.bin/make/tests/execution/ellipsis/expected.status.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/execution/ellipsis/expected.status.1
+++ b/usr.bin/bmake/tests/execution/ellipsis/expected.status.1
diff --git a/usr.bin/make/tests/execution/ellipsis/expected.stderr.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/execution/ellipsis/expected.stderr.1
+++ b/usr.bin/bmake/tests/execution/ellipsis/expected.stderr.1
diff --git a/usr.bin/make/tests/execution/ellipsis/expected.stdout.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.stdout.1
index a7e5727..a7e5727 100644
--- a/usr.bin/make/tests/execution/ellipsis/expected.stdout.1
+++ b/usr.bin/bmake/tests/execution/ellipsis/expected.stdout.1
diff --git a/usr.bin/make/tests/execution/ellipsis/legacy_test.sh b/usr.bin/bmake/tests/execution/ellipsis/legacy_test.sh
index 9e9cd01..9e9cd01 100644
--- a/usr.bin/make/tests/execution/ellipsis/legacy_test.sh
+++ b/usr.bin/bmake/tests/execution/ellipsis/legacy_test.sh
diff --git a/usr.bin/make/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile
index eb77957..6421b96 100644
--- a/usr.bin/make/tests/execution/joberr/Makefile
+++ b/usr.bin/bmake/tests/execution/empty/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/joberr
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/empty
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/execution/empty/Makefile.test b/usr.bin/bmake/tests/execution/empty/Makefile.test
index f687bce..f687bce 100644
--- a/usr.bin/make/tests/execution/empty/Makefile.test
+++ b/usr.bin/bmake/tests/execution/empty/Makefile.test
diff --git a/usr.bin/make/tests/execution/empty/expected.status.1 b/usr.bin/bmake/tests/execution/empty/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/execution/empty/expected.status.1
+++ b/usr.bin/bmake/tests/execution/empty/expected.status.1
diff --git a/usr.bin/make/tests/execution/empty/expected.stderr.1 b/usr.bin/bmake/tests/execution/empty/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/execution/empty/expected.stderr.1
+++ b/usr.bin/bmake/tests/execution/empty/expected.stderr.1
diff --git a/usr.bin/make/tests/execution/empty/expected.stdout.1 b/usr.bin/bmake/tests/execution/empty/expected.stdout.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/execution/empty/expected.stdout.1
+++ b/usr.bin/bmake/tests/execution/empty/expected.stdout.1
diff --git a/usr.bin/make/tests/execution/empty/legacy_test.sh b/usr.bin/bmake/tests/execution/empty/legacy_test.sh
index e02d175..e02d175 100644
--- a/usr.bin/make/tests/execution/empty/legacy_test.sh
+++ b/usr.bin/bmake/tests/execution/empty/legacy_test.sh
diff --git a/usr.bin/make/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile
index 31c2714..d183eb1 100644
--- a/usr.bin/make/tests/execution/empty/Makefile
+++ b/usr.bin/bmake/tests/execution/joberr/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/empty
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/joberr
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/execution/joberr/Makefile.test b/usr.bin/bmake/tests/execution/joberr/Makefile.test
index aca86e8..aca86e8 100644
--- a/usr.bin/make/tests/execution/joberr/Makefile.test
+++ b/usr.bin/bmake/tests/execution/joberr/Makefile.test
diff --git a/usr.bin/make/tests/execution/joberr/expected.status.1 b/usr.bin/bmake/tests/execution/joberr/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/execution/joberr/expected.status.1
+++ b/usr.bin/bmake/tests/execution/joberr/expected.status.1
diff --git a/usr.bin/make/tests/execution/joberr/expected.stderr.1 b/usr.bin/bmake/tests/execution/joberr/expected.stderr.1
index d0c8a2e..d0c8a2e 100644
--- a/usr.bin/make/tests/execution/joberr/expected.stderr.1
+++ b/usr.bin/bmake/tests/execution/joberr/expected.stderr.1
diff --git a/usr.bin/make/tests/execution/joberr/expected.stdout.1 b/usr.bin/bmake/tests/execution/joberr/expected.stdout.1
index 0ee28f4..0ee28f4 100644
--- a/usr.bin/make/tests/execution/joberr/expected.stdout.1
+++ b/usr.bin/bmake/tests/execution/joberr/expected.stdout.1
diff --git a/usr.bin/make/tests/execution/joberr/legacy_test.sh b/usr.bin/bmake/tests/execution/joberr/legacy_test.sh
index 429bfe1..429bfe1 100644
--- a/usr.bin/make/tests/execution/joberr/legacy_test.sh
+++ b/usr.bin/bmake/tests/execution/joberr/legacy_test.sh
diff --git a/usr.bin/make/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile
index 2dea979..8b489d5 100644
--- a/usr.bin/make/tests/execution/plus/Makefile
+++ b/usr.bin/bmake/tests/execution/plus/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/plus
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/plus
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/execution/plus/Makefile.test b/usr.bin/bmake/tests/execution/plus/Makefile.test
index ae3bdc3..ae3bdc3 100644
--- a/usr.bin/make/tests/execution/plus/Makefile.test
+++ b/usr.bin/bmake/tests/execution/plus/Makefile.test
diff --git a/usr.bin/make/tests/execution/plus/expected.status.1 b/usr.bin/bmake/tests/execution/plus/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/execution/plus/expected.status.1
+++ b/usr.bin/bmake/tests/execution/plus/expected.status.1
diff --git a/usr.bin/make/tests/execution/plus/expected.stderr.1 b/usr.bin/bmake/tests/execution/plus/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/execution/plus/expected.stderr.1
+++ b/usr.bin/bmake/tests/execution/plus/expected.stderr.1
diff --git a/usr.bin/make/tests/execution/plus/expected.stdout.1 b/usr.bin/bmake/tests/execution/plus/expected.stdout.1
index b334fc7..b334fc7 100644
--- a/usr.bin/make/tests/execution/plus/expected.stdout.1
+++ b/usr.bin/bmake/tests/execution/plus/expected.stdout.1
diff --git a/usr.bin/make/tests/execution/plus/legacy_test.sh b/usr.bin/bmake/tests/execution/plus/legacy_test.sh
index 0737d1b..0737d1b 100644
--- a/usr.bin/make/tests/execution/plus/legacy_test.sh
+++ b/usr.bin/bmake/tests/execution/plus/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/Makefile b/usr.bin/bmake/tests/shell/Makefile
index cde8335..13b570e 100644
--- a/usr.bin/make/tests/shell/Makefile
+++ b/usr.bin/bmake/tests/shell/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell
 
 TESTS_SUBDIRS=	builtin meta path path_select replace select
 
diff --git a/usr.bin/make/tests/shell/builtin/Makefile b/usr.bin/bmake/tests/shell/builtin/Makefile
index 3a73215..cd458a9 100644
--- a/usr.bin/make/tests/shell/builtin/Makefile
+++ b/usr.bin/bmake/tests/shell/builtin/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/builtin
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/builtin
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/builtin/Makefile.test b/usr.bin/bmake/tests/shell/builtin/Makefile.test
index 0376478..0376478 100644
--- a/usr.bin/make/tests/shell/builtin/Makefile.test
+++ b/usr.bin/bmake/tests/shell/builtin/Makefile.test
diff --git a/usr.bin/make/tests/shell/builtin/expected.status.1 b/usr.bin/bmake/tests/shell/builtin/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/builtin/expected.status.1
+++ b/usr.bin/bmake/tests/shell/builtin/expected.status.1
diff --git a/usr.bin/make/tests/shell/builtin/expected.status.2 b/usr.bin/bmake/tests/shell/builtin/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/builtin/expected.status.2
+++ b/usr.bin/bmake/tests/shell/builtin/expected.status.2
diff --git a/usr.bin/make/tests/shell/builtin/expected.stderr.1 b/usr.bin/bmake/tests/shell/builtin/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/builtin/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/builtin/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/builtin/expected.stderr.2 b/usr.bin/bmake/tests/shell/builtin/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/builtin/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/builtin/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/builtin/expected.stdout.1 b/usr.bin/bmake/tests/shell/builtin/expected.stdout.1
index 9c558e3..9c558e3 100644
--- a/usr.bin/make/tests/shell/builtin/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/builtin/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/builtin/expected.stdout.2 b/usr.bin/bmake/tests/shell/builtin/expected.stdout.2
index e350eaf..e350eaf 100644
--- a/usr.bin/make/tests/shell/builtin/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/builtin/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/builtin/legacy_test.sh b/usr.bin/bmake/tests/shell/builtin/legacy_test.sh
index 6347583..6347583 100644
--- a/usr.bin/make/tests/shell/builtin/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/builtin/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/builtin/sh b/usr.bin/bmake/tests/shell/builtin/sh
index 3a507b87..3a507b87 100644
--- a/usr.bin/make/tests/shell/builtin/sh
+++ b/usr.bin/bmake/tests/shell/builtin/sh
diff --git a/usr.bin/make/tests/shell/meta/Makefile b/usr.bin/bmake/tests/shell/meta/Makefile
index ebd2177..b342e79 100644
--- a/usr.bin/make/tests/shell/meta/Makefile
+++ b/usr.bin/bmake/tests/shell/meta/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/meta
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/meta
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/meta/Makefile.test b/usr.bin/bmake/tests/shell/meta/Makefile.test
index bcf19d0..bcf19d0 100644
--- a/usr.bin/make/tests/shell/meta/Makefile.test
+++ b/usr.bin/bmake/tests/shell/meta/Makefile.test
diff --git a/usr.bin/make/tests/shell/meta/expected.status.1 b/usr.bin/bmake/tests/shell/meta/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/meta/expected.status.1
+++ b/usr.bin/bmake/tests/shell/meta/expected.status.1
diff --git a/usr.bin/make/tests/shell/meta/expected.status.2 b/usr.bin/bmake/tests/shell/meta/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/meta/expected.status.2
+++ b/usr.bin/bmake/tests/shell/meta/expected.status.2
diff --git a/usr.bin/make/tests/shell/meta/expected.stderr.1 b/usr.bin/bmake/tests/shell/meta/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/meta/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/meta/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/meta/expected.stderr.2 b/usr.bin/bmake/tests/shell/meta/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/meta/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/meta/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/meta/expected.stdout.1 b/usr.bin/bmake/tests/shell/meta/expected.stdout.1
index 9c558e3..9c558e3 100644
--- a/usr.bin/make/tests/shell/meta/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/meta/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/meta/expected.stdout.2 b/usr.bin/bmake/tests/shell/meta/expected.stdout.2
index 6ac6f19..6ac6f19 100644
--- a/usr.bin/make/tests/shell/meta/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/meta/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/meta/legacy_test.sh b/usr.bin/bmake/tests/shell/meta/legacy_test.sh
index 41cd763..41cd763 100644
--- a/usr.bin/make/tests/shell/meta/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/meta/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/meta/sh b/usr.bin/bmake/tests/shell/meta/sh
index 3a507b87..3a507b87 100644
--- a/usr.bin/make/tests/shell/meta/sh
+++ b/usr.bin/bmake/tests/shell/meta/sh
diff --git a/usr.bin/make/tests/shell/path/Makefile b/usr.bin/bmake/tests/shell/path/Makefile
index d1eb37a..5a83a1f 100644
--- a/usr.bin/make/tests/shell/path/Makefile
+++ b/usr.bin/bmake/tests/shell/path/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/path/Makefile.test b/usr.bin/bmake/tests/shell/path/Makefile.test
index fe40b64..fe40b64 100644
--- a/usr.bin/make/tests/shell/path/Makefile.test
+++ b/usr.bin/bmake/tests/shell/path/Makefile.test
diff --git a/usr.bin/make/tests/shell/path/expected.status.1 b/usr.bin/bmake/tests/shell/path/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/path/expected.status.1
+++ b/usr.bin/bmake/tests/shell/path/expected.status.1
diff --git a/usr.bin/make/tests/shell/path/expected.status.2 b/usr.bin/bmake/tests/shell/path/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/path/expected.status.2
+++ b/usr.bin/bmake/tests/shell/path/expected.status.2
diff --git a/usr.bin/make/tests/shell/path/expected.stderr.1 b/usr.bin/bmake/tests/shell/path/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/path/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/path/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/path/expected.stderr.2 b/usr.bin/bmake/tests/shell/path/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/path/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/path/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/path/expected.stdout.1 b/usr.bin/bmake/tests/shell/path/expected.stdout.1
index d881364..d881364 100644
--- a/usr.bin/make/tests/shell/path/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/path/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/path/expected.stdout.2 b/usr.bin/bmake/tests/shell/path/expected.stdout.2
index de3fc89..de3fc89 100644
--- a/usr.bin/make/tests/shell/path/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/path/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/path/legacy_test.sh b/usr.bin/bmake/tests/shell/path/legacy_test.sh
index 9289a8d..9289a8d 100644
--- a/usr.bin/make/tests/shell/path/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/path/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/path/sh b/usr.bin/bmake/tests/shell/path/sh
index 46169eb..46169eb 100644
--- a/usr.bin/make/tests/shell/path/sh
+++ b/usr.bin/bmake/tests/shell/path/sh
diff --git a/usr.bin/make/tests/shell/path_select/Makefile b/usr.bin/bmake/tests/shell/path_select/Makefile
index d9341b4..1819f91 100644
--- a/usr.bin/make/tests/shell/path_select/Makefile
+++ b/usr.bin/bmake/tests/shell/path_select/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path_select
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path_select
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/path_select/Makefile.test b/usr.bin/bmake/tests/shell/path_select/Makefile.test
index 05cfb27..05cfb27 100644
--- a/usr.bin/make/tests/shell/path_select/Makefile.test
+++ b/usr.bin/bmake/tests/shell/path_select/Makefile.test
diff --git a/usr.bin/make/tests/shell/path_select/expected.status.1 b/usr.bin/bmake/tests/shell/path_select/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/path_select/expected.status.1
+++ b/usr.bin/bmake/tests/shell/path_select/expected.status.1
diff --git a/usr.bin/make/tests/shell/path_select/expected.status.2 b/usr.bin/bmake/tests/shell/path_select/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/path_select/expected.status.2
+++ b/usr.bin/bmake/tests/shell/path_select/expected.status.2
diff --git a/usr.bin/make/tests/shell/path_select/expected.stderr.1 b/usr.bin/bmake/tests/shell/path_select/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/path_select/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/path_select/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/path_select/expected.stderr.2 b/usr.bin/bmake/tests/shell/path_select/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/path_select/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/path_select/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/path_select/expected.stdout.1 b/usr.bin/bmake/tests/shell/path_select/expected.stdout.1
index d881364..d881364 100644
--- a/usr.bin/make/tests/shell/path_select/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/path_select/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/path_select/expected.stdout.2 b/usr.bin/bmake/tests/shell/path_select/expected.stdout.2
index de3fc89..de3fc89 100644
--- a/usr.bin/make/tests/shell/path_select/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/path_select/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/path_select/legacy_test.sh b/usr.bin/bmake/tests/shell/path_select/legacy_test.sh
index 6b75b90..6b75b90 100644
--- a/usr.bin/make/tests/shell/path_select/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/path_select/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/path_select/shell b/usr.bin/bmake/tests/shell/path_select/shell
index 46169eb..46169eb 100644
--- a/usr.bin/make/tests/shell/path_select/shell
+++ b/usr.bin/bmake/tests/shell/path_select/shell
diff --git a/usr.bin/make/tests/shell/replace/Makefile b/usr.bin/bmake/tests/shell/replace/Makefile
index 7c64d72..0dae915 100644
--- a/usr.bin/make/tests/shell/replace/Makefile
+++ b/usr.bin/bmake/tests/shell/replace/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/replace
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/replace
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/replace/Makefile.test b/usr.bin/bmake/tests/shell/replace/Makefile.test
index 2160dbf..2160dbf 100644
--- a/usr.bin/make/tests/shell/replace/Makefile.test
+++ b/usr.bin/bmake/tests/shell/replace/Makefile.test
diff --git a/usr.bin/make/tests/shell/replace/expected.status.1 b/usr.bin/bmake/tests/shell/replace/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/replace/expected.status.1
+++ b/usr.bin/bmake/tests/shell/replace/expected.status.1
diff --git a/usr.bin/make/tests/shell/replace/expected.status.2 b/usr.bin/bmake/tests/shell/replace/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/replace/expected.status.2
+++ b/usr.bin/bmake/tests/shell/replace/expected.status.2
diff --git a/usr.bin/make/tests/shell/replace/expected.stderr.1 b/usr.bin/bmake/tests/shell/replace/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/replace/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/replace/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/replace/expected.stderr.2 b/usr.bin/bmake/tests/shell/replace/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/replace/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/replace/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/replace/expected.stdout.1 b/usr.bin/bmake/tests/shell/replace/expected.stdout.1
index eff99ea..eff99ea 100644
--- a/usr.bin/make/tests/shell/replace/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/replace/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/replace/expected.stdout.2 b/usr.bin/bmake/tests/shell/replace/expected.stdout.2
index c79a09a..c79a09a 100644
--- a/usr.bin/make/tests/shell/replace/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/replace/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/replace/legacy_test.sh b/usr.bin/bmake/tests/shell/replace/legacy_test.sh
index 880ca78..880ca78 100644
--- a/usr.bin/make/tests/shell/replace/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/replace/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/replace/shell b/usr.bin/bmake/tests/shell/replace/shell
index 46169eb..46169eb 100644
--- a/usr.bin/make/tests/shell/replace/shell
+++ b/usr.bin/bmake/tests/shell/replace/shell
diff --git a/usr.bin/make/tests/shell/select/Makefile b/usr.bin/bmake/tests/shell/select/Makefile
index 85486c6..45e6d72 100644
--- a/usr.bin/make/tests/shell/select/Makefile
+++ b/usr.bin/bmake/tests/shell/select/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/select
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/select
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/select/Makefile.test b/usr.bin/bmake/tests/shell/select/Makefile.test
index 74d96e1..74d96e1 100644
--- a/usr.bin/make/tests/shell/select/Makefile.test
+++ b/usr.bin/bmake/tests/shell/select/Makefile.test
diff --git a/usr.bin/make/tests/shell/select/expected.status.1 b/usr.bin/bmake/tests/shell/select/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/select/expected.status.1
+++ b/usr.bin/bmake/tests/shell/select/expected.status.1
diff --git a/usr.bin/make/tests/shell/select/expected.status.2 b/usr.bin/bmake/tests/shell/select/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/shell/select/expected.status.2
+++ b/usr.bin/bmake/tests/shell/select/expected.status.2
diff --git a/usr.bin/make/tests/shell/select/expected.stderr.1 b/usr.bin/bmake/tests/shell/select/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/select/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/select/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/select/expected.stderr.2 b/usr.bin/bmake/tests/shell/select/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/shell/select/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/select/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/select/expected.stdout.1 b/usr.bin/bmake/tests/shell/select/expected.stdout.1
index c2cdaa0..c2cdaa0 100644
--- a/usr.bin/make/tests/shell/select/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/select/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/select/expected.stdout.2 b/usr.bin/bmake/tests/shell/select/expected.stdout.2
index 5a831e8..5a831e8 100644
--- a/usr.bin/make/tests/shell/select/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/select/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/select/legacy_test.sh b/usr.bin/bmake/tests/shell/select/legacy_test.sh
index 46d3eaf..46d3eaf 100644
--- a/usr.bin/make/tests/shell/select/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/select/legacy_test.sh
diff --git a/usr.bin/make/tests/suffixes/Makefile b/usr.bin/bmake/tests/suffixes/Makefile
index f15620d..60ec86e 100644
--- a/usr.bin/make/tests/suffixes/Makefile
+++ b/usr.bin/bmake/tests/suffixes/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes
 
 TESTS_SUBDIRS=	basic src_wild1 src_wild2
 
diff --git a/usr.bin/make/tests/suffixes/basic/Makefile b/usr.bin/bmake/tests/suffixes/basic/Makefile
index 2bd3a78..9ae720e 100644
--- a/usr.bin/make/tests/suffixes/basic/Makefile
+++ b/usr.bin/bmake/tests/suffixes/basic/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/basic
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/basic
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/suffixes/basic/Makefile.test b/usr.bin/bmake/tests/suffixes/basic/Makefile.test
index 45d9130..45d9130 100644
--- a/usr.bin/make/tests/suffixes/basic/Makefile.test
+++ b/usr.bin/bmake/tests/suffixes/basic/Makefile.test
diff --git a/usr.bin/make/tests/suffixes/basic/TEST1.a b/usr.bin/bmake/tests/suffixes/basic/TEST1.a
index da5569b..da5569b 100644
--- a/usr.bin/make/tests/suffixes/basic/TEST1.a
+++ b/usr.bin/bmake/tests/suffixes/basic/TEST1.a
diff --git a/usr.bin/make/tests/suffixes/basic/expected.status.1 b/usr.bin/bmake/tests/suffixes/basic/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/suffixes/basic/expected.status.1
+++ b/usr.bin/bmake/tests/suffixes/basic/expected.status.1
diff --git a/usr.bin/make/tests/suffixes/basic/expected.stderr.1 b/usr.bin/bmake/tests/suffixes/basic/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/suffixes/basic/expected.stderr.1
+++ b/usr.bin/bmake/tests/suffixes/basic/expected.stderr.1
diff --git a/usr.bin/make/tests/suffixes/basic/expected.stdout.1 b/usr.bin/bmake/tests/suffixes/basic/expected.stdout.1
index 582927e..582927e 100644
--- a/usr.bin/make/tests/suffixes/basic/expected.stdout.1
+++ b/usr.bin/bmake/tests/suffixes/basic/expected.stdout.1
diff --git a/usr.bin/make/tests/suffixes/basic/legacy_test.sh b/usr.bin/bmake/tests/suffixes/basic/legacy_test.sh
index 3446bf0..3446bf0 100644
--- a/usr.bin/make/tests/suffixes/basic/legacy_test.sh
+++ b/usr.bin/bmake/tests/suffixes/basic/legacy_test.sh
diff --git a/usr.bin/make/tests/suffixes/src_wild1/Makefile b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
index e10e8e8..00be930 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/suffixes/src_wild1/Makefile.test b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test
index d0258ad..d0258ad 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/Makefile.test
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test
diff --git a/usr.bin/make/tests/suffixes/src_wild1/TEST1.a b/usr.bin/bmake/tests/suffixes/src_wild1/TEST1.a
index da5569b..da5569b 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/TEST1.a
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/TEST1.a
diff --git a/usr.bin/make/tests/suffixes/src_wild1/TEST2.a b/usr.bin/bmake/tests/suffixes/src_wild1/TEST2.a
index 34f8508..34f8508 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/TEST2.a
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/TEST2.a
diff --git a/usr.bin/make/tests/suffixes/src_wild1/expected.status.1 b/usr.bin/bmake/tests/suffixes/src_wild1/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/expected.status.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/expected.status.1
diff --git a/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1 b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stderr.1
diff --git a/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1 b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stdout.1
index 3cd2129..3cd2129 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stdout.1
diff --git a/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh b/usr.bin/bmake/tests/suffixes/src_wild1/legacy_test.sh
index 053cc6c..053cc6c 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/legacy_test.sh
diff --git a/usr.bin/make/tests/suffixes/src_wild2/Makefile b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
index a474bae..34aad07 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/suffixes/src_wild2/Makefile.test b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile.test
index 1dea7ea..1dea7ea 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/Makefile.test
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile.test
diff --git a/usr.bin/make/tests/suffixes/src_wild2/TEST1.a b/usr.bin/bmake/tests/suffixes/src_wild2/TEST1.a
index da5569b..da5569b 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/TEST1.a
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/TEST1.a
diff --git a/usr.bin/make/tests/suffixes/src_wild2/TEST2.a b/usr.bin/bmake/tests/suffixes/src_wild2/TEST2.a
index 34f8508..34f8508 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/TEST2.a
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/TEST2.a
diff --git a/usr.bin/make/tests/suffixes/src_wild2/expected.status.1 b/usr.bin/bmake/tests/suffixes/src_wild2/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/expected.status.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/expected.status.1
diff --git a/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1 b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stderr.1
diff --git a/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1 b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stdout.1
index 3cd2129..3cd2129 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stdout.1
diff --git a/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh b/usr.bin/bmake/tests/suffixes/src_wild2/legacy_test.sh
index 03cff93..03cff93 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/legacy_test.sh
diff --git a/usr.bin/make/tests/syntax/Makefile b/usr.bin/bmake/tests/syntax/Makefile
index 80f1846..3cd89f8 100644
--- a/usr.bin/make/tests/syntax/Makefile
+++ b/usr.bin/bmake/tests/syntax/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax
 
 TESTS_SUBDIRS=	directive-t0 enl funny-targets semi
 
diff --git a/usr.bin/bmake/tests/syntax/directive-t0/Makefile b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
new file mode 100644
index 0000000..66e1f32
--- /dev/null
+++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/directive-t0
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/syntax/directive-t0/Makefile.test b/usr.bin/bmake/tests/syntax/directive-t0/Makefile.test
index 0f95a21..0f95a21 100644
--- a/usr.bin/make/tests/syntax/directive-t0/Makefile.test
+++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile.test
diff --git a/usr.bin/make/tests/syntax/directive-t0/expected.status.1 b/usr.bin/bmake/tests/syntax/directive-t0/expected.status.1
index d00491f..d00491f 100644
--- a/usr.bin/make/tests/syntax/directive-t0/expected.status.1
+++ b/usr.bin/bmake/tests/syntax/directive-t0/expected.status.1
diff --git a/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1 b/usr.bin/bmake/tests/syntax/directive-t0/expected.stderr.1
index de66fcc..de66fcc 100644
--- a/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1
+++ b/usr.bin/bmake/tests/syntax/directive-t0/expected.stderr.1
diff --git a/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1 b/usr.bin/bmake/tests/syntax/directive-t0/expected.stdout.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1
+++ b/usr.bin/bmake/tests/syntax/directive-t0/expected.stdout.1
diff --git a/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh b/usr.bin/bmake/tests/syntax/directive-t0/legacy_test.sh
index 451c876..451c876 100644
--- a/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh
+++ b/usr.bin/bmake/tests/syntax/directive-t0/legacy_test.sh
diff --git a/usr.bin/make/tests/syntax/enl/Makefile b/usr.bin/bmake/tests/syntax/enl/Makefile
index 362962c..743e88f 100644
--- a/usr.bin/make/tests/syntax/enl/Makefile
+++ b/usr.bin/bmake/tests/syntax/enl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/enl
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/enl
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/syntax/enl/Makefile.test b/usr.bin/bmake/tests/syntax/enl/Makefile.test
index a7c6955..a7c6955 100644
--- a/usr.bin/make/tests/syntax/enl/Makefile.test
+++ b/usr.bin/bmake/tests/syntax/enl/Makefile.test
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.1 b/usr.bin/bmake/tests/syntax/enl/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.1
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.1
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.2 b/usr.bin/bmake/tests/syntax/enl/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.2
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.2
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.3 b/usr.bin/bmake/tests/syntax/enl/expected.status.3
index 573541a..573541a 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.3
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.3
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.4 b/usr.bin/bmake/tests/syntax/enl/expected.status.4
index 573541a..573541a 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.4
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.4
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.5 b/usr.bin/bmake/tests/syntax/enl/expected.status.5
index 573541a..573541a 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.5
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.5
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.1 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.1
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.1
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.2 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.2
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.2
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.3 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.3
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.3
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.3
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.4 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.4
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.4
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.4
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.5 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.5
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.5
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.5
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.1 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.1
index 9766475..9766475 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.1
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.1
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.2 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.2
index 9766475..9766475 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.2
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.2
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.3 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.3
index 422c2b7..422c2b7 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.3
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.3
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.4 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.4
index b2901ea..b2901ea 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.4
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.4
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.5 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.5
index 5120076..5120076 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.5
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.5
diff --git a/usr.bin/make/tests/syntax/enl/legacy_test.sh b/usr.bin/bmake/tests/syntax/enl/legacy_test.sh
index 307c1f0..307c1f0 100644
--- a/usr.bin/make/tests/syntax/enl/legacy_test.sh
+++ b/usr.bin/bmake/tests/syntax/enl/legacy_test.sh
diff --git a/usr.bin/make/tests/syntax/funny-targets/Makefile b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
index 07b1f75..53a3e4d 100644
--- a/usr.bin/make/tests/syntax/funny-targets/Makefile
+++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/funny-targets
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/funny-targets
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/syntax/funny-targets/Makefile.test b/usr.bin/bmake/tests/syntax/funny-targets/Makefile.test
index 064ab3a..064ab3a 100644
--- a/usr.bin/make/tests/syntax/funny-targets/Makefile.test
+++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile.test
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.status.1 b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.status.1
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.1
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.status.2 b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.status.2
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.2
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.1
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.2
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.1
index 09cb232..09cb232 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.1
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.2
index b2f0364..b2f0364 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.2
diff --git a/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh b/usr.bin/bmake/tests/syntax/funny-targets/legacy_test.sh
index e9cd317..e9cd317 100644
--- a/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh
+++ b/usr.bin/bmake/tests/syntax/funny-targets/legacy_test.sh
diff --git a/usr.bin/make/tests/syntax/semi/Makefile b/usr.bin/bmake/tests/syntax/semi/Makefile
index 703683d..00a7f1e 100644
--- a/usr.bin/make/tests/syntax/semi/Makefile
+++ b/usr.bin/bmake/tests/syntax/semi/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/semi
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/semi
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/syntax/semi/Makefile.test b/usr.bin/bmake/tests/syntax/semi/Makefile.test
index 12f5225..12f5225 100644
--- a/usr.bin/make/tests/syntax/semi/Makefile.test
+++ b/usr.bin/bmake/tests/syntax/semi/Makefile.test
diff --git a/usr.bin/make/tests/syntax/semi/expected.status.1 b/usr.bin/bmake/tests/syntax/semi/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/syntax/semi/expected.status.1
+++ b/usr.bin/bmake/tests/syntax/semi/expected.status.1
diff --git a/usr.bin/make/tests/syntax/semi/expected.status.2 b/usr.bin/bmake/tests/syntax/semi/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/syntax/semi/expected.status.2
+++ b/usr.bin/bmake/tests/syntax/semi/expected.status.2
diff --git a/usr.bin/make/tests/syntax/semi/expected.stderr.1 b/usr.bin/bmake/tests/syntax/semi/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/semi/expected.stderr.1
+++ b/usr.bin/bmake/tests/syntax/semi/expected.stderr.1
diff --git a/usr.bin/make/tests/syntax/semi/expected.stderr.2 b/usr.bin/bmake/tests/syntax/semi/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/syntax/semi/expected.stderr.2
+++ b/usr.bin/bmake/tests/syntax/semi/expected.stderr.2
diff --git a/usr.bin/make/tests/syntax/semi/expected.stdout.1 b/usr.bin/bmake/tests/syntax/semi/expected.stdout.1
index 12b9617..12b9617 100644
--- a/usr.bin/make/tests/syntax/semi/expected.stdout.1
+++ b/usr.bin/bmake/tests/syntax/semi/expected.stdout.1
diff --git a/usr.bin/make/tests/syntax/semi/expected.stdout.2 b/usr.bin/bmake/tests/syntax/semi/expected.stdout.2
index be0fa55..be0fa55 100644
--- a/usr.bin/make/tests/syntax/semi/expected.stdout.2
+++ b/usr.bin/bmake/tests/syntax/semi/expected.stdout.2
diff --git a/usr.bin/make/tests/syntax/semi/legacy_test.sh b/usr.bin/bmake/tests/syntax/semi/legacy_test.sh
index 092635a..092635a 100644
--- a/usr.bin/make/tests/syntax/semi/legacy_test.sh
+++ b/usr.bin/bmake/tests/syntax/semi/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/Makefile b/usr.bin/bmake/tests/sysmk/Makefile
index 7b7b981..90d90f1 100644
--- a/usr.bin/make/tests/sysmk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk
 
 TESTS_SUBDIRS=	t0 t1 t2
 
diff --git a/usr.bin/make/tests/variables/t0/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
index 06e1179..5578a9b 100644
--- a/usr.bin/make/tests/variables/t0/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile.test
index fc95f46..fc95f46 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile.test
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1 b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.status.1
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1 b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stderr.1
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1 b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stdout.1
index 6f29307..6f29307 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stdout.1
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh b/usr.bin/bmake/tests/sysmk/t0/2/1/legacy_test.sh
index 0214842..0214842 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/t2/2/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
index 3dd84f0..2204807 100644
--- a/usr.bin/make/tests/sysmk/t2/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2
 
 TESTS_SUBDIRS=	1
 
diff --git a/usr.bin/make/tests/sysmk/t1/Makefile b/usr.bin/bmake/tests/sysmk/t0/Makefile
index d8a2c06..f38383c 100644
--- a/usr.bin/make/tests/sysmk/t1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0
 
 TESTS_SUBDIRS=	2
 SUBDIR=		mk
diff --git a/usr.bin/make/tests/sysmk/t0/mk/Makefile b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
index 047b9de..be1bd5a 100644
--- a/usr.bin/make/tests/sysmk/t0/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/mk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk
 
 FILESDIR=		${TESTSDIR}
 FILES=			sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test
index 60f1955..60f1955 100644
--- a/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test
+++ b/usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
index aa93766..c5e2889 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2/1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/cleanup b/usr.bin/bmake/tests/sysmk/t1/2/1/cleanup
index c3d58b7..c3d58b7 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/cleanup
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/cleanup
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1 b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.status.1
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1 b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stderr.1
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1 b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stdout.1
index 6f29307..6f29307 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stdout.1
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh b/usr.bin/bmake/tests/sysmk/t1/2/1/legacy_test.sh
index fb73851..fb73851 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/t0/2/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
index ecd79b3..7c2e619 100644
--- a/usr.bin/make/tests/sysmk/t0/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2
 
 TESTS_SUBDIRS=	1
 
diff --git a/usr.bin/make/tests/sysmk/t2/Makefile b/usr.bin/bmake/tests/sysmk/t1/Makefile
index 3f95a85..4d32823 100644
--- a/usr.bin/make/tests/sysmk/t2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1
 
 TESTS_SUBDIRS=	2
 SUBDIR=		mk
diff --git a/usr.bin/make/tests/sysmk/t1/mk/Makefile b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
index da052af..ccfd1b6 100644
--- a/usr.bin/make/tests/sysmk/t1/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/mk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk
 
 FILESDIR=		${TESTSDIR}
 FILES=			sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test
index 99b8ecc..99b8ecc 100644
--- a/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test
+++ b/usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
index 52fdd8d..e06539a 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2/1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/cleanup b/usr.bin/bmake/tests/sysmk/t2/2/1/cleanup
index c3d58b7..c3d58b7 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/cleanup
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/cleanup
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1 b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.status.1
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1 b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stderr.1
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1 b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stdout.1
index 70f1be3..70f1be3 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stdout.1
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh b/usr.bin/bmake/tests/sysmk/t2/2/1/legacy_test.sh
index ca817d8..ca817d8 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/t1/2/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
index 3e5d82c..7d1c68e 100644
--- a/usr.bin/make/tests/sysmk/t1/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2
 
 TESTS_SUBDIRS=	1
 
diff --git a/usr.bin/make/tests/sysmk/t0/Makefile b/usr.bin/bmake/tests/sysmk/t2/Makefile
index 2777925..734c7d8 100644
--- a/usr.bin/make/tests/sysmk/t0/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2
 
 TESTS_SUBDIRS=	2
 SUBDIR=		mk
diff --git a/usr.bin/make/tests/sysmk/t2/mk/Makefile b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
index 5fdb1ac..29460dc 100644
--- a/usr.bin/make/tests/sysmk/t2/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/mk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk
 
 FILESDIR=		${TESTSDIR}
 FILES=			sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test
index 55632fd..55632fd 100644
--- a/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test
+++ b/usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test
diff --git a/usr.bin/make/tests/test-new.mk b/usr.bin/bmake/tests/test-new.mk
index f200833..f200833 100644
--- a/usr.bin/make/tests/test-new.mk
+++ b/usr.bin/bmake/tests/test-new.mk
diff --git a/usr.bin/make/tests/variables/Makefile b/usr.bin/bmake/tests/variables/Makefile
index 9f328a8..e010718 100644
--- a/usr.bin/make/tests/variables/Makefile
+++ b/usr.bin/bmake/tests/variables/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables
 
 TESTS_SUBDIRS=	modifier_M modifier_t opt_V t0
 
diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile
new file mode 100644
index 0000000..2490382
--- /dev/null
+++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_M
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/modifier_M/Makefile.test b/usr.bin/bmake/tests/variables/modifier_M/Makefile.test
index 34d4cd4..34d4cd4 100644
--- a/usr.bin/make/tests/variables/modifier_M/Makefile.test
+++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile.test
diff --git a/usr.bin/make/tests/variables/modifier_M/expected.status.1 b/usr.bin/bmake/tests/variables/modifier_M/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/variables/modifier_M/expected.status.1
+++ b/usr.bin/bmake/tests/variables/modifier_M/expected.status.1
diff --git a/usr.bin/make/tests/variables/modifier_M/expected.stderr.1 b/usr.bin/bmake/tests/variables/modifier_M/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/variables/modifier_M/expected.stderr.1
+++ b/usr.bin/bmake/tests/variables/modifier_M/expected.stderr.1
diff --git a/usr.bin/make/tests/variables/modifier_M/expected.stdout.1 b/usr.bin/bmake/tests/variables/modifier_M/expected.stdout.1
index b29e6df..b29e6df 100644
--- a/usr.bin/make/tests/variables/modifier_M/expected.stdout.1
+++ b/usr.bin/bmake/tests/variables/modifier_M/expected.stdout.1
diff --git a/usr.bin/make/tests/variables/modifier_M/legacy_test.sh b/usr.bin/bmake/tests/variables/modifier_M/legacy_test.sh
index 6a3e68f..6a3e68f 100644
--- a/usr.bin/make/tests/variables/modifier_M/legacy_test.sh
+++ b/usr.bin/bmake/tests/variables/modifier_M/legacy_test.sh
diff --git a/usr.bin/make/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile
index 4b5bfee..d108da4 100644
--- a/usr.bin/make/tests/variables/modifier_t/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_t
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_t
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/variables/modifier_t/Makefile.test b/usr.bin/bmake/tests/variables/modifier_t/Makefile.test
index 53844ee..53844ee 100644
--- a/usr.bin/make/tests/variables/modifier_t/Makefile.test
+++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile.test
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.status.1 b/usr.bin/bmake/tests/variables/modifier_t/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.status.1
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.status.1
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.status.2 b/usr.bin/bmake/tests/variables/modifier_t/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.status.2
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.status.2
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.status.3 b/usr.bin/bmake/tests/variables/modifier_t/expected.status.3
index 573541a..573541a 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.status.3
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.status.3
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stderr.1 b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stderr.1
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.1
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stderr.2 b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stderr.2
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.2
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stderr.3 b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.3
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stderr.3
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.3
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stdout.1 b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.1
index dff38fd..dff38fd 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stdout.1
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.1
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stdout.2 b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.2
index 71a0f60..71a0f60 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stdout.2
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.2
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stdout.3 b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.3
index 6434c7b..6434c7b 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stdout.3
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.3
diff --git a/usr.bin/make/tests/variables/modifier_t/legacy_test.sh b/usr.bin/bmake/tests/variables/modifier_t/legacy_test.sh
index 7f14571..7f14571 100644
--- a/usr.bin/make/tests/variables/modifier_t/legacy_test.sh
+++ b/usr.bin/bmake/tests/variables/modifier_t/legacy_test.sh
diff --git a/usr.bin/make/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile
index 0c3bf17..94a6aff 100644
--- a/usr.bin/make/tests/variables/opt_V/Makefile
+++ b/usr.bin/bmake/tests/variables/opt_V/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/opt_V
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/opt_V
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/variables/opt_V/Makefile.test b/usr.bin/bmake/tests/variables/opt_V/Makefile.test
index 128e511..128e511 100644
--- a/usr.bin/make/tests/variables/opt_V/Makefile.test
+++ b/usr.bin/bmake/tests/variables/opt_V/Makefile.test
diff --git a/usr.bin/make/tests/variables/opt_V/expected.status.1 b/usr.bin/bmake/tests/variables/opt_V/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.status.1
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.status.1
diff --git a/usr.bin/make/tests/variables/opt_V/expected.status.2 b/usr.bin/bmake/tests/variables/opt_V/expected.status.2
index 573541a..573541a 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.status.2
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.status.2
diff --git a/usr.bin/make/tests/variables/opt_V/expected.stderr.1 b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.stderr.1
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.1
diff --git a/usr.bin/make/tests/variables/opt_V/expected.stderr.2 b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.2
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.stderr.2
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.2
diff --git a/usr.bin/make/tests/variables/opt_V/expected.stdout.1 b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.1
index 050db40..050db40 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.stdout.1
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.1
diff --git a/usr.bin/make/tests/variables/opt_V/expected.stdout.2 b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.2
index 4da2aef..4da2aef 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.stdout.2
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.2
diff --git a/usr.bin/make/tests/variables/opt_V/legacy_test.sh b/usr.bin/bmake/tests/variables/opt_V/legacy_test.sh
index 4b1122a..4b1122a 100644
--- a/usr.bin/make/tests/variables/opt_V/legacy_test.sh
+++ b/usr.bin/bmake/tests/variables/opt_V/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile
index 2c732f5..c4b98e6 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/Makefile
+++ b/usr.bin/bmake/tests/variables/t0/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2/1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/t0
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/variables/t0/Makefile.test b/usr.bin/bmake/tests/variables/t0/Makefile.test
index 1cc58ee..1cc58ee 100644
--- a/usr.bin/make/tests/variables/t0/Makefile.test
+++ b/usr.bin/bmake/tests/variables/t0/Makefile.test
diff --git a/usr.bin/make/tests/variables/t0/expected.status.1 b/usr.bin/bmake/tests/variables/t0/expected.status.1
index 573541a..573541a 100644
--- a/usr.bin/make/tests/variables/t0/expected.status.1
+++ b/usr.bin/bmake/tests/variables/t0/expected.status.1
diff --git a/usr.bin/make/tests/variables/t0/expected.stderr.1 b/usr.bin/bmake/tests/variables/t0/expected.stderr.1
index e69de29..e69de29 100644
--- a/usr.bin/make/tests/variables/t0/expected.stderr.1
+++ b/usr.bin/bmake/tests/variables/t0/expected.stderr.1
diff --git a/usr.bin/make/tests/variables/t0/expected.stdout.1 b/usr.bin/bmake/tests/variables/t0/expected.stdout.1
index e2c70de..e2c70de 100644
--- a/usr.bin/make/tests/variables/t0/expected.stdout.1
+++ b/usr.bin/bmake/tests/variables/t0/expected.stdout.1
diff --git a/usr.bin/make/tests/variables/t0/legacy_test.sh b/usr.bin/bmake/tests/variables/t0/legacy_test.sh
index 8c78e2d..8c78e2d 100644
--- a/usr.bin/make/tests/variables/t0/legacy_test.sh
+++ b/usr.bin/bmake/tests/variables/t0/legacy_test.sh
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index bd9d58d..dbc545f 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -116,8 +116,4 @@ PROG=	fmake
 fmake.1: make.1
 	cp ${.ALLSRC} ${.TARGET}
 
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/make/tests/syntax/directive-t0/Makefile b/usr.bin/make/tests/syntax/directive-t0/Makefile
deleted file mode 100644
index 6d557e2..0000000
--- a/usr.bin/make/tests/syntax/directive-t0/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/directive-t0
-
-TAP_TESTS_SH=	legacy_test
-
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
-
-.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/modifier_M/Makefile b/usr.bin/make/tests/variables/modifier_M/Makefile
deleted file mode 100644
index 59cb0bc..0000000
--- a/usr.bin/make/tests/variables/modifier_M/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_M
-
-TAP_TESTS_SH=	legacy_test
-
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
-
-.include <bsd.test.mk>