diff options
author | ngie <ngie@FreeBSD.org> | 2015-12-15 18:09:03 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-12-15 18:09:03 +0000 |
commit | f5aa9d7c17d766c6c46fd76262196deca017aabb (patch) | |
tree | bf15272b74aa0c3921426a2f0ff5e36e60e1ab3c | |
parent | 6d12e854a1505834a4033351822719e46e54dd23 (diff) | |
download | FreeBSD-src-f5aa9d7c17d766c6c46fd76262196deca017aabb.zip FreeBSD-src-f5aa9d7c17d766c6c46fd76262196deca017aabb.tar.gz |
MFC r276669,r276723:
r276669:
Integrate bin/cat/tests from NetBSD into atf/kyua
Sponsored by: EMC / Isilon Storage Division
r276723:
Install d_align.{in,out} for the :align test
Pointyhat to: me
-rw-r--r-- | bin/cat/Makefile | 6 | ||||
-rw-r--r-- | bin/cat/tests/Makefile | 18 | ||||
-rw-r--r-- | etc/mtree/BSD.tests.dist | 2 |
3 files changed, 26 insertions, 0 deletions
diff --git a/bin/cat/Makefile b/bin/cat/Makefile index 672a4ee..3d6a7f0 100644 --- a/bin/cat/Makefile +++ b/bin/cat/Makefile @@ -1,6 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <bsd.own.mk> + PROG= cat +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> diff --git a/bin/cat/tests/Makefile b/bin/cat/tests/Makefile new file mode 100644 index 0000000..73f82e1 --- /dev/null +++ b/bin/cat/tests/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +OBJTOP= ${.OBJDIR}/../../.. +SRCTOP= ${.CURDIR}/../../.. +TESTSRC= ${SRCTOP}/contrib/netbsd-tests/bin/cat + +TESTSDIR= ${TESTSBASE}/bin/cat + +NETBSD_ATF_TESTS_SH= cat_test + +FILESDIR= ${TESTSDIR} + +FILES= d_align.in +FILES+= d_align.out + +.include <netbsd-tests.test.mk> + +.include <bsd.test.mk> diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index fac7232..c6b1486 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -6,6 +6,8 @@ /set type=dir uname=root gname=wheel mode=0755 . bin + cat + .. chown .. date |