svn commit: r292282 - in stable/10: bin/cat bin/cat/tests etc/mtree

[Garrett Cooper]

Author: ngie
Date: Tue Dec 15 18:09:03 2015
New Revision: 292282
URL: https://svnweb.freebsd.org/changeset/base/292282

Log:
  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

Added:
  stable/10/bin/cat/tests/
     - copied from r276669, head/bin/cat/tests/
Modified:
  stable/10/bin/cat/Makefile
  stable/10/bin/cat/tests/Makefile
  stable/10/etc/mtree/BSD.tests.dist
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/cat/Makefile
==============================================================================
--- stable/10/bin/cat/Makefile	Tue Dec 15 18:02:56 2015	(r292281)
+++ stable/10/bin/cat/Makefile	Tue Dec 15 18:09:03 2015	(r292282)
@@ -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>

Modified: stable/10/bin/cat/tests/Makefile
==============================================================================
--- head/bin/cat/tests/Makefile	Sun Jan  4 22:37:44 2015	(r276669)
+++ stable/10/bin/cat/tests/Makefile	Tue Dec 15 18:09:03 2015	(r292282)
@@ -8,6 +8,11 @@ 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>

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Tue Dec 15 18:02:56 2015	(r292281)
+++ stable/10/etc/mtree/BSD.tests.dist	Tue Dec 15 18:09:03 2015	(r292282)
@@ -6,6 +6,8 @@
 /set type=dir uname=root gname=wheel mode=0755
 .
     bin
+        cat
+        ..
         chown
         ..
         date