From owner-svn-src-stable@freebsd.org  Tue Dec 15 18:09:05 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92D2FA437C2;
 Tue, 15 Dec 2015 18:09:05 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 45643138F;
 Tue, 15 Dec 2015 18:09:05 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBFI94bB033173;
 Tue, 15 Dec 2015 18:09:04 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFI94nw033170;
 Tue, 15 Dec 2015 18:09:04 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512151809.tBFI94nw033170@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 15 Dec 2015 18:09:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r292282 - in stable/10: bin/cat bin/cat/tests etc/mtree
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2015 18:09:05 -0000

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