svn commit: r312127 - in projects/netbsd-tests-upstream-01-2017: etc/mtree usr.bin/uniq usr.bin/uniq/tests

[Ngie Cooper]

Author: ngie
Date: Sat Jan 14 06:51:31 2017
New Revision: 312127
URL: https://svnweb.freebsd.org/changeset/base/312127

Log:
  Integrate .../contrib/netbsd-tests/usr.bin/uniq into the FreeBSD test
  suite as .../usr.bin/uniq/tests
  
  Sponsored by:	Dell EMC Isilon

Added:
  projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/tests/
  projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/tests/Makefile   (contents, props changed)
  projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/tests/Makefile.depend   (contents, props changed)
Modified:
  projects/netbsd-tests-upstream-01-2017/etc/mtree/BSD.tests.dist
  projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/Makefile

Modified: projects/netbsd-tests-upstream-01-2017/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/etc/mtree/BSD.tests.dist	Sat Jan 14 06:49:17 2017	(r312126)
+++ projects/netbsd-tests-upstream-01-2017/etc/mtree/BSD.tests.dist	Sat Jan 14 06:51:31 2017	(r312127)
@@ -660,6 +660,8 @@
         ..
         uuencode
         ..
+        uniq
+        ..
         xargs
         ..
         xinstall

Modified: projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/Makefile
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/Makefile	Sat Jan 14 06:49:17 2017	(r312126)
+++ projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/Makefile	Sat Jan 14 06:51:31 2017	(r312127)
@@ -1,6 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	uniq
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Added: projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/tests/Makefile	Sat Jan 14 06:51:31 2017	(r312127)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PACKAGE=		tests
+
+NETBSD_ATF_TESTS_SH=	uniq_test
+
+${PACKAGE}FILES+=	d_basic.in
+${PACKAGE}FILES+=	d_basic.out
+${PACKAGE}FILES+=	d_counts.out
+${PACKAGE}FILES+=	d_input.in
+${PACKAGE}FILES+=	d_show_duplicates.out
+${PACKAGE}FILES+=	d_show_uniques.out
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>

Added: projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/tests/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/netbsd-tests-upstream-01-2017/usr.bin/uniq/tests/Makefile.depend	Sat Jan 14 06:51:31 2017	(r312127)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif