svn commit: r276669 - in head: bin/cat bin/cat/tests etc/mtree

[Garrett Cooper]

Author: ngie
Date: Sun Jan  4 22:37:44 2015
New Revision: 276669
URL: https://svnweb.freebsd.org/changeset/base/276669

Log:
  Integrate bin/cat/tests from NetBSD into atf/kyua
  
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/bin/cat/tests/
  head/bin/cat/tests/Makefile   (contents, props changed)
Modified:
  head/bin/cat/Makefile
  head/etc/mtree/BSD.tests.dist

Modified: head/bin/cat/Makefile
==============================================================================
--- head/bin/cat/Makefile	Sun Jan  4 22:25:16 2015	(r276668)
+++ head/bin/cat/Makefile	Sun Jan  4 22:37:44 2015	(r276669)
@@ -1,6 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	cat
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Added: head/bin/cat/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/bin/cat/tests/Makefile	Sun Jan  4 22:37:44 2015	(r276669)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+OBJTOP=		${.OBJDIR}/../../..
+SRCTOP=		${.CURDIR}/../../..
+TESTSRC=	${SRCTOP}/contrib/netbsd-tests/bin/cat
+
+TESTSDIR=	${TESTSBASE}/bin/cat
+
+NETBSD_ATF_TESTS_SH=		cat_test
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Sun Jan  4 22:25:16 2015	(r276668)
+++ head/etc/mtree/BSD.tests.dist	Sun Jan  4 22:37:44 2015	(r276669)
@@ -6,6 +6,8 @@
 /set type=dir uname=root gname=wheel mode=0755
 .
     bin
+        cat
+        ..
         chown
         ..
         date