Add Makefiles missed in r263346.

Grrr, I wish svn clearly displayed files not yet added when about to commit.

49 files changed, 659 insertions, 0 deletions

diff --git a/usr.bin/make/tests/Makefile b/usr.bin/make/tests/Makefile
new file mode 100644
index 0000000..d5bad60
--- /dev/null
+++ b/usr.bin/make/tests/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make
+
+FILESDIR=	${TESTSDIR}
+FILES=		common.sh
+FILES+=		test-new.mk
+
+TESTS_SUBDIRS=	archives
+TESTS_SUBDIRS+=	basic
+TESTS_SUBDIRS+=	execution
+TESTS_SUBDIRS+=	shell
+TESTS_SUBDIRS+=	suffixes
+TESTS_SUBDIRS+=	syntax
+TESTS_SUBDIRS+=	sysmk
+TESTS_SUBDIRS+=	variables
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/archives/Makefile b/usr.bin/make/tests/archives/Makefile
new file mode 100644
index 0000000..f8944e0
--- /dev/null
+++ b/usr.bin/make/tests/archives/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives
+
+TESTS_SUBDIRS=	fmt_44bsd fmt_44bsd_mod fmt_oldbsd
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/Makefile b/usr.bin/make/tests/archives/fmt_44bsd/Makefile
new file mode 100644
index 0000000..bf6ad40
--- /dev/null
+++ b/usr.bin/make/tests/archives/fmt_44bsd/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.status.6
+FILES+=		expected.status.7
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stderr.6
+FILES+=		expected.stderr.7
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+FILES+=		expected.stdout.6
+FILES+=		expected.stdout.7
+FILES+=		libtest.a
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
new file mode 100644
index 0000000..8d63b64
--- /dev/null
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd_mod
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.status.6
+FILES+=		expected.status.7
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stderr.6
+FILES+=		expected.stderr.7
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+FILES+=		expected.stdout.6
+FILES+=		expected.stdout.7
+FILES+=		libtest.a
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile b/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
new file mode 100644
index 0000000..ab1c383
--- /dev/null
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_oldbsd
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.status.6
+FILES+=		expected.status.7
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stderr.6
+FILES+=		expected.stderr.7
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+FILES+=		expected.stdout.6
+FILES+=		expected.stdout.7
+FILES+=		libtest.a
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/basic/Makefile b/usr.bin/make/tests/basic/Makefile
new file mode 100644
index 0000000..fd7044e
--- /dev/null
+++ b/usr.bin/make/tests/basic/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic
+
+TESTS_SUBDIRS=	t0 t1 t2 t3
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/basic/t0/Makefile b/usr.bin/make/tests/basic/t0/Makefile
new file mode 100644
index 0000000..ef390dd
--- /dev/null
+++ b/usr.bin/make/tests/basic/t0/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t0
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/basic/t1/Makefile b/usr.bin/make/tests/basic/t1/Makefile
new file mode 100644
index 0000000..efd9030
--- /dev/null
+++ b/usr.bin/make/tests/basic/t1/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/basic/t2/Makefile b/usr.bin/make/tests/basic/t2/Makefile
new file mode 100644
index 0000000..4b598ea
--- /dev/null
+++ b/usr.bin/make/tests/basic/t2/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t2
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/basic/t3/Makefile b/usr.bin/make/tests/basic/t3/Makefile
new file mode 100644
index 0000000..00c3757
--- /dev/null
+++ b/usr.bin/make/tests/basic/t3/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t3
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/execution/Makefile b/usr.bin/make/tests/execution/Makefile
new file mode 100644
index 0000000..52ba9b7
--- /dev/null
+++ b/usr.bin/make/tests/execution/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution
+
+TESTS_SUBDIRS=	ellipsis empty joberr plus
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/execution/ellipsis/Makefile b/usr.bin/make/tests/execution/ellipsis/Makefile
new file mode 100644
index 0000000..7f3dc3e
--- /dev/null
+++ b/usr.bin/make/tests/execution/ellipsis/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/ellipsis
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/execution/empty/Makefile b/usr.bin/make/tests/execution/empty/Makefile
new file mode 100644
index 0000000..31c2714
--- /dev/null
+++ b/usr.bin/make/tests/execution/empty/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/empty
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/execution/joberr/Makefile b/usr.bin/make/tests/execution/joberr/Makefile
new file mode 100644
index 0000000..eb77957
--- /dev/null
+++ b/usr.bin/make/tests/execution/joberr/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/joberr
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/execution/plus/Makefile b/usr.bin/make/tests/execution/plus/Makefile
new file mode 100644
index 0000000..2dea979
--- /dev/null
+++ b/usr.bin/make/tests/execution/plus/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/plus
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/shell/Makefile b/usr.bin/make/tests/shell/Makefile
new file mode 100644
index 0000000..cde8335
--- /dev/null
+++ b/usr.bin/make/tests/shell/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell
+
+TESTS_SUBDIRS=	builtin meta path path_select replace select
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/shell/builtin/Makefile b/usr.bin/make/tests/shell/builtin/Makefile
new file mode 100644
index 0000000..3a73215
--- /dev/null
+++ b/usr.bin/make/tests/shell/builtin/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/builtin
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/shell/meta/Makefile b/usr.bin/make/tests/shell/meta/Makefile
new file mode 100644
index 0000000..ebd2177
--- /dev/null
+++ b/usr.bin/make/tests/shell/meta/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/meta
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/shell/path/Makefile b/usr.bin/make/tests/shell/path/Makefile
new file mode 100644
index 0000000..d1eb37a
--- /dev/null
+++ b/usr.bin/make/tests/shell/path/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/shell/path_select/Makefile b/usr.bin/make/tests/shell/path_select/Makefile
new file mode 100644
index 0000000..d9341b4
--- /dev/null
+++ b/usr.bin/make/tests/shell/path_select/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path_select
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		shell
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/shell/replace/Makefile b/usr.bin/make/tests/shell/replace/Makefile
new file mode 100644
index 0000000..7c64d72
--- /dev/null
+++ b/usr.bin/make/tests/shell/replace/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/replace
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		shell
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/shell/select/Makefile b/usr.bin/make/tests/shell/select/Makefile
new file mode 100644
index 0000000..85486c6
--- /dev/null
+++ b/usr.bin/make/tests/shell/select/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/select
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/suffixes/Makefile b/usr.bin/make/tests/suffixes/Makefile
new file mode 100644
index 0000000..f15620d
--- /dev/null
+++ b/usr.bin/make/tests/suffixes/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes
+
+TESTS_SUBDIRS=	basic src_wild1 src_wild2
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/suffixes/basic/Makefile b/usr.bin/make/tests/suffixes/basic/Makefile
new file mode 100644
index 0000000..2bd3a78
--- /dev/null
+++ b/usr.bin/make/tests/suffixes/basic/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/basic
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		TEST1.a
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/suffixes/src_wild1/Makefile b/usr.bin/make/tests/suffixes/src_wild1/Makefile
new file mode 100644
index 0000000..e10e8e8
--- /dev/null
+++ b/usr.bin/make/tests/suffixes/src_wild1/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		TEST1.a
+FILES+=		TEST2.a
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/suffixes/src_wild2/Makefile b/usr.bin/make/tests/suffixes/src_wild2/Makefile
new file mode 100644
index 0000000..a474bae
--- /dev/null
+++ b/usr.bin/make/tests/suffixes/src_wild2/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild2
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		TEST1.a
+FILES+=		TEST2.a
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/syntax/Makefile b/usr.bin/make/tests/syntax/Makefile
new file mode 100644
index 0000000..80f1846
--- /dev/null
+++ b/usr.bin/make/tests/syntax/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax
+
+TESTS_SUBDIRS=	directive-t0 enl funny-targets semi
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/syntax/directive-t0/Makefile b/usr.bin/make/tests/syntax/directive-t0/Makefile
new file mode 100644
index 0000000..6d557e2
--- /dev/null
+++ b/usr.bin/make/tests/syntax/directive-t0/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/directive-t0
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/syntax/enl/Makefile b/usr.bin/make/tests/syntax/enl/Makefile
new file mode 100644
index 0000000..362962c
--- /dev/null
+++ b/usr.bin/make/tests/syntax/enl/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/enl
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/syntax/funny-targets/Makefile b/usr.bin/make/tests/syntax/funny-targets/Makefile
new file mode 100644
index 0000000..07b1f75
--- /dev/null
+++ b/usr.bin/make/tests/syntax/funny-targets/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/funny-targets
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/syntax/semi/Makefile b/usr.bin/make/tests/syntax/semi/Makefile
new file mode 100644
index 0000000..703683d
--- /dev/null
+++ b/usr.bin/make/tests/syntax/semi/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/semi
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/Makefile b/usr.bin/make/tests/sysmk/Makefile
new file mode 100644
index 0000000..7b7b981
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk
+
+TESTS_SUBDIRS=	t0 t1 t2
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/Makefile b/usr.bin/make/tests/sysmk/t0/2/1/Makefile
new file mode 100644
index 0000000..2c732f5
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t0/2/1/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2/1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t0/2/Makefile b/usr.bin/make/tests/sysmk/t0/2/Makefile
new file mode 100644
index 0000000..ecd79b3
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t0/2/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2
+
+TESTS_SUBDIRS=	1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t0/Makefile b/usr.bin/make/tests/sysmk/t0/Makefile
new file mode 100644
index 0000000..2777925
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t0/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0
+
+TESTS_SUBDIRS=	2
+SUBDIR=		mk
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t0/mk/Makefile b/usr.bin/make/tests/sysmk/t0/mk/Makefile
new file mode 100644
index 0000000..047b9de
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t0/mk/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/mk
+
+FILESDIR=		${TESTSDIR}
+FILES=			sys.mk.test
+FILESNAME_sys.mk.test=	sys.mk
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/Makefile b/usr.bin/make/tests/sysmk/t1/2/1/Makefile
new file mode 100644
index 0000000..aa93766
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t1/2/1/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2/1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		cleanup
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t1/2/Makefile b/usr.bin/make/tests/sysmk/t1/2/Makefile
new file mode 100644
index 0000000..3e5d82c
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t1/2/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2
+
+TESTS_SUBDIRS=	1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t1/Makefile b/usr.bin/make/tests/sysmk/t1/Makefile
new file mode 100644
index 0000000..d8a2c06
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t1/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1
+
+TESTS_SUBDIRS=	2
+SUBDIR=		mk
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t1/mk/Makefile b/usr.bin/make/tests/sysmk/t1/mk/Makefile
new file mode 100644
index 0000000..da052af
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t1/mk/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/mk
+
+FILESDIR=		${TESTSDIR}
+FILES=			sys.mk.test
+FILESNAME_sys.mk.test=	sys.mk
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/Makefile b/usr.bin/make/tests/sysmk/t2/2/1/Makefile
new file mode 100644
index 0000000..52fdd8d
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t2/2/1/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2/1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		cleanup
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t2/2/Makefile b/usr.bin/make/tests/sysmk/t2/2/Makefile
new file mode 100644
index 0000000..3dd84f0
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t2/2/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2
+
+TESTS_SUBDIRS=	1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t2/Makefile b/usr.bin/make/tests/sysmk/t2/Makefile
new file mode 100644
index 0000000..3f95a85
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t2/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2
+
+TESTS_SUBDIRS=	2
+SUBDIR=		mk
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/sysmk/t2/mk/Makefile b/usr.bin/make/tests/sysmk/t2/mk/Makefile
new file mode 100644
index 0000000..5fdb1ac
--- /dev/null
+++ b/usr.bin/make/tests/sysmk/t2/mk/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/mk
+
+FILESDIR=		${TESTSDIR}
+FILES=			sys.mk.test
+FILESNAME_sys.mk.test=	sys.mk
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/Makefile b/usr.bin/make/tests/variables/Makefile
new file mode 100644
index 0000000..9f328a8
--- /dev/null
+++ b/usr.bin/make/tests/variables/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables
+
+TESTS_SUBDIRS=	modifier_M modifier_t opt_V t0
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/modifier_M/Makefile b/usr.bin/make/tests/variables/modifier_M/Makefile
new file mode 100644
index 0000000..59cb0bc
--- /dev/null
+++ b/usr.bin/make/tests/variables/modifier_M/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_M
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/modifier_t/Makefile b/usr.bin/make/tests/variables/modifier_t/Makefile
new file mode 100644
index 0000000..4b5bfee
--- /dev/null
+++ b/usr.bin/make/tests/variables/modifier_t/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_t
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/opt_V/Makefile b/usr.bin/make/tests/variables/opt_V/Makefile
new file mode 100644
index 0000000..0c3bf17
--- /dev/null
+++ b/usr.bin/make/tests/variables/opt_V/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/opt_V
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/t0/Makefile b/usr.bin/make/tests/variables/t0/Makefile
new file mode 100644
index 0000000..06e1179
--- /dev/null
+++ b/usr.bin/make/tests/variables/t0/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/t0
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>