From 76145c66037651512a73877c86cec6d2338a4ca6 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 15 Dec 2015 18:09:03 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/stable/10@292282 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 bin/cat/Makefile         |  6 ++++++
 bin/cat/tests/Makefile   | 18 ++++++++++++++++++
 etc/mtree/BSD.tests.dist |  2 ++
 3 files changed, 26 insertions(+)
 create mode 100644 bin/cat/tests/Makefile

diff --git a/bin/cat/Makefile b/bin/cat/Makefile
index 672a4eeee..3d6a7f0bc 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 000000000..73f82e125
--- /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 fac723280..c6b148676 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
-- 
2.42.0