diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-04-28 07:50:45 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-04-28 07:50:45 +0000 |
| commit | 3b8f08459569bf0faa21473e5cec2491e95c9349 (patch) | |
| tree | 80f45dd81ca716bcd7ca9674581e1fc40b93cd34 /usr.bin/join | |
| parent | 9d2ab4a62d6733c45958627ac113bdbd818d1e2a (diff) | |
| parent | b2ba55951383498f252746f618d513139da06e8e (diff) | |
| download | src-test-3b8f08459569bf0faa21473e5cec2491e95c9349.tar.gz src-test-3b8f08459569bf0faa21473e5cec2491e95c9349.zip | |
Merge head
Notes
Notes:
svn path=/projects/bmake/; revision=265044
Diffstat (limited to 'usr.bin/join')
| -rw-r--r-- | usr.bin/join/Makefile | 7 | ||||
| -rw-r--r-- | usr.bin/join/tests/Makefile | 13 | ||||
| -rw-r--r-- | usr.bin/join/tests/legacy_test.sh | 6 | ||||
| -rw-r--r-- | usr.bin/join/tests/regress.1.in | 4 | ||||
| -rw-r--r-- | usr.bin/join/tests/regress.2.in | 4 | ||||
| -rw-r--r-- | usr.bin/join/tests/regress.out | 5 | ||||
| -rw-r--r-- | usr.bin/join/tests/regress.sh | 9 |
7 files changed, 48 insertions, 0 deletions
diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile index 3fa8629152c1a..61634ee2ec095 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 0000000000000..2d5580ff76d62 --- /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 0000000000000..1b6b806c59802 --- /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 0000000000000..975bbaf13b3b5 --- /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 0000000000000..0206b49fda550 --- /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 0000000000000..fa75c88052a40 --- /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 0000000000000..e07e554de489e --- /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() |