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

- r263220 Migrate tools/regression/sbin/ to the new tests layout.
- r263222 Add Makefile missed in r263220.
- r263226 Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new tests layout.
- r263227 Migrate most of tools/regression/usr.bin/ to the new tests layout.
- r263345 Expand tabs that sneaked in into spaces.
- r263346 Migrate tools/regression/usr.bin/make/ to the new tests layout.
- r263348 Add Makefiles missed in r263346.
- r263351 Migrate tools/regression/usr.bin/pkill/ to the new tests layout.
- r263388 Mark multi_test as requiring /usr/share/dict/words.
- r263814 Fix path to the run.pl script to let these tests run.
- r264742 Prevent building tests when bootstrapping make.

This is 'make tinderbox' clean.

7 files changed, 48 insertions, 0 deletions

diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile
index 3fa8629..61634ee 100644
--- a/usr.bin/join/Makefile
+++ b/usr.bin/join/Makefile
@@ -1,5 +1,12 @@
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 PROG=	join
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/join/tests/Makefile b/usr.bin/join/tests/Makefile
new file mode 100644
index 0000000..2d5580f
--- /dev/null
+++ b/usr.bin/join/tests/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/join
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.1.in
+FILES+=		regress.2.in
+FILES+=		regress.out
+FILES+=		regress.sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/join/tests/legacy_test.sh b/usr.bin/join/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/join/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/usr.bin/join/tests/regress.1.in b/usr.bin/join/tests/regress.1.in
new file mode 100644
index 0000000..975bbaf
--- /dev/null
+++ b/usr.bin/join/tests/regress.1.in
@@ -0,0 +1,4 @@
+!Name,Data1
+Foo,1
+Bar,2
+Baz,3
diff --git a/usr.bin/join/tests/regress.2.in b/usr.bin/join/tests/regress.2.in
new file mode 100644
index 0000000..0206b49
--- /dev/null
+++ b/usr.bin/join/tests/regress.2.in
@@ -0,0 +1,4 @@
+!Name,Data2
+Foo,Bar
+Baz,2
+Foobar,1
diff --git a/usr.bin/join/tests/regress.out b/usr.bin/join/tests/regress.out
new file mode 100644
index 0000000..fa75c88
--- /dev/null
+++ b/usr.bin/join/tests/regress.out
@@ -0,0 +1,5 @@
+!Name,Data1,Data2
+Foo,1,Bar
+Bar,2,(unknown)
+Baz,3,2
+Foobar,(unknown),1
diff --git a/usr.bin/join/tests/regress.sh b/usr.bin/join/tests/regress.sh
new file mode 100644
index 0000000..e07e554
--- /dev/null
+++ b/usr.bin/join/tests/regress.sh
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+echo 1..1
+
+REGRESSION_START($1)
+
+REGRESSION_TEST_ONE(`join -t , -a1 -a2 -e "(unknown)" -o 0,1.2,2.2 ${SRCDIR}/regress.1.in ${SRCDIR}/regress.2.in')
+
+REGRESSION_END()