From owner-svn-src-head@FreeBSD.ORG  Sun Jan  4 22:37:46 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C5E79A0E;
 Sun,  4 Jan 2015 22:37:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 B18BE2E38;
 Sun,  4 Jan 2015 22:37:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t04MbkO3097840;
 Sun, 4 Jan 2015 22:37:46 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t04MbkEp097835;
 Sun, 4 Jan 2015 22:37:46 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201501042237.t04MbkEp097835@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 4 Jan 2015 22:37:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276669 - in head: bin/cat bin/cat/tests etc/mtree
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jan 2015 22:37:46 -0000

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