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

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

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

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

13 files changed, 71 insertions, 0 deletions

diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile
index 13da76f..59c9751 100644
--- a/usr.bin/comm/Makefile
+++ b/usr.bin/comm/Makefile
@@ -1,6 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	comm
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/comm/tests/Makefile b/usr.bin/comm/tests/Makefile
new file mode 100644
index 0000000..172943d
--- /dev/null
+++ b/usr.bin/comm/tests/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/comm
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.00.out
+FILES+=		regress.00a.in
+FILES+=		regress.00b.in
+FILES+=		regress.01.out
+FILES+=		regress.01a.in
+FILES+=		regress.01b.in
+FILES+=		regress.02.out
+FILES+=		regress.02a.in
+FILES+=		regress.02b.in
+FILES+=		regress.sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/comm/tests/legacy_test.sh b/usr.bin/comm/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/comm/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/usr.bin/comm/tests/regress.00.out b/usr.bin/comm/tests/regress.00.out
new file mode 100644
index 0000000..89a65da
--- /dev/null
+++ b/usr.bin/comm/tests/regress.00.out
@@ -0,0 +1,2 @@
+a b
+e f g
diff --git a/usr.bin/comm/tests/regress.00a.in b/usr.bin/comm/tests/regress.00a.in
new file mode 100644
index 0000000..85b5cd5
--- /dev/null
+++ b/usr.bin/comm/tests/regress.00a.in
@@ -0,0 +1,5 @@
+a b
+c d
+e f
+e f g
+h i
diff --git a/usr.bin/comm/tests/regress.00b.in b/usr.bin/comm/tests/regress.00b.in
new file mode 100644
index 0000000..89a65da
--- /dev/null
+++ b/usr.bin/comm/tests/regress.00b.in
@@ -0,0 +1,2 @@
+a b
+e f g
diff --git a/usr.bin/comm/tests/regress.01.out b/usr.bin/comm/tests/regress.01.out
new file mode 100644
index 0000000..05ab154
--- /dev/null
+++ b/usr.bin/comm/tests/regress.01.out
@@ -0,0 +1,2 @@
+a	b
+e	f	g
diff --git a/usr.bin/comm/tests/regress.01a.in b/usr.bin/comm/tests/regress.01a.in
new file mode 100644
index 0000000..78c410b
--- /dev/null
+++ b/usr.bin/comm/tests/regress.01a.in
@@ -0,0 +1,5 @@
+a	b
+c	d
+e	f
+e	f	g
+h	i
diff --git a/usr.bin/comm/tests/regress.01b.in b/usr.bin/comm/tests/regress.01b.in
new file mode 100644
index 0000000..05ab154
--- /dev/null
+++ b/usr.bin/comm/tests/regress.01b.in
@@ -0,0 +1,2 @@
+a	b
+e	f	g
diff --git a/usr.bin/comm/tests/regress.02.out b/usr.bin/comm/tests/regress.02.out
new file mode 100644
index 0000000..a451adb
--- /dev/null
+++ b/usr.bin/comm/tests/regress.02.out
@@ -0,0 +1,5 @@
+a
+b
+		c
+	d
+	e
diff --git a/usr.bin/comm/tests/regress.02a.in b/usr.bin/comm/tests/regress.02a.in
new file mode 100644
index 0000000..1c943a9
--- /dev/null
+++ b/usr.bin/comm/tests/regress.02a.in
@@ -0,0 +1,3 @@
+a
+b
+c
\ No newline at end of file
diff --git a/usr.bin/comm/tests/regress.02b.in b/usr.bin/comm/tests/regress.02b.in
new file mode 100644
index 0000000..36019ee
--- /dev/null
+++ b/usr.bin/comm/tests/regress.02b.in
@@ -0,0 +1,3 @@
+c
+d
+e
\ No newline at end of file
diff --git a/usr.bin/comm/tests/regress.sh b/usr.bin/comm/tests/regress.sh
new file mode 100644
index 0000000..dcd0348
--- /dev/null
+++ b/usr.bin/comm/tests/regress.sh
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+echo 1..3
+
+REGRESSION_START($1)
+
+REGRESSION_TEST(`00', `comm -12 ${SRCDIR}/regress.00a.in ${SRCDIR}/regress.00b.in')
+REGRESSION_TEST(`01', `comm -12 ${SRCDIR}/regress.01a.in ${SRCDIR}/regress.01b.in')
+REGRESSION_TEST(`02', `comm ${SRCDIR}/regress.02a.in ${SRCDIR}/regress.02b.in')
+
+REGRESSION_END()