svn commit: r272787 - in head: etc/mtree gnu/usr.bin/diff gnu/usr.bin/diff/tests

[Garrett Cooper]

Author: ngie
Date: Thu Oct  9 02:07:34 2014
New Revision: 272787
URL: https://svnweb.freebsd.org/changeset/base/272787

Log:
  Integrate usr.bin/diff/tests from NetBSD into atf/kyua at gnu/usr.bin/diff/tests
  
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/gnu/usr.bin/diff/tests/
  head/gnu/usr.bin/diff/tests/Makefile   (contents, props changed)
Modified:
  head/etc/mtree/BSD.tests.dist
  head/gnu/usr.bin/diff/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Thu Oct  9 01:59:25 2014	(r272786)
+++ head/etc/mtree/BSD.tests.dist	Thu Oct  9 02:07:34 2014	(r272787)
@@ -70,6 +70,8 @@
             lib
             ..
             usr.bin
+                diff
+                ..
             ..
         ..
         lib

Modified: head/gnu/usr.bin/diff/Makefile
==============================================================================
--- head/gnu/usr.bin/diff/Makefile	Thu Oct  9 01:59:25 2014	(r272786)
+++ head/gnu/usr.bin/diff/Makefile	Thu Oct  9 02:07:34 2014	(r272787)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 DIFFSRC=${.CURDIR}/../../../contrib/diff/src
 .PATH: ${DIFFSRC} \
        ${.CURDIR}/../../../contrib/diff/lib \
@@ -27,4 +29,8 @@ SUBDIR+=doc
 DPADD=	${LIBGNUREGEX}
 LDADD=	-lgnuregex
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Added: head/gnu/usr.bin/diff/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/gnu/usr.bin/diff/tests/Makefile	Thu Oct  9 02:07:34 2014	(r272787)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSRC=	${.CURDIR}/../../../../contrib/netbsd-tests/usr.bin/diff
+.PATH: ${TESTSRC}
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/gnu/usr.bin/diff
+ATF_TESTS_SH=	diff_test
+ATF_TESTS_SH_SED_diff_test=	-e 's/t_diff/`basename $$0`/g'
+ATF_TESTS_SH_SRC_diff_test=	t_diff.sh
+
+FILESDIR=	${TESTSDIR}
+FILES+=		d_mallocv1.in
+FILES+=		d_mallocv2.in
+
+.include <bsd.test.mk>