summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-01-01 02:04:44 +0000
committerngie <ngie@FreeBSD.org>2015-01-01 02:04:44 +0000
commit0971283da1a2343a9fa413073fcd4e1fe7d153ed (patch)
treef431d239ff3a5545c3648186537ddfe6a97dae6e /gnu/usr.bin
parenta7ae9a638d5518687d8fddb26ebf58af5d3e6f2d (diff)
downloadFreeBSD-src-0971283da1a2343a9fa413073fcd4e1fe7d153ed.zip
FreeBSD-src-0971283da1a2343a9fa413073fcd4e1fe7d153ed.tar.gz
MFC r272777,r272779,r272780,r272781,r272782,r272783,r272784,r272787,r272788:
r272777: Integrate usr.sbin/nmtree/tests from NetBSD into atf/kyua In collaboration with: pho Sponsored by: EMC / Isilon Storage Division r272779: Integrate usr.sbin/basename/tests from NetBSD into atf/kyua In collaboration with: pho Sponsored by: EMC / Isilon Storage Division r272780: Integrate usr.bin/cmp/tests from NetBSD into atf/kyua In collaboration with: sjg Sponsored by: EMC / Isilon Storage Division r272781: Integrate usr.bin/dirname/tests from NetBSD into atf/kyua In collaboration with: pho, sjg Sponsored by: EMC / Isilon Storage Division r272782: Integrate bin/sleep/tests from NetBSD into atf/kyua Sponsored by: EMC / Isilon Storage Division r272783: Integrate usr.bin/cut/tests from NetBSD into atf/kyua Sponsored by: EMC / Isilon Storage Division r272784: Integrate usr.bin/grep/tests from NetBSD into atf/kyua Sponsored by: EMC / Isilon Storage Division r272787: Integrate usr.bin/diff/tests from NetBSD into atf/kyua at gnu/usr.bin/diff/tests Sponsored by: EMC / Isilon Storage Division r272788: Integrate usr.bin/gzip/tests from NetBSD into atf/kyua Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/diff/Makefile6
-rw-r--r--gnu/usr.bin/diff/tests/Makefile17
2 files changed, 23 insertions, 0 deletions
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index c5c66dc..a3222cb 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.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>
diff --git a/gnu/usr.bin/diff/tests/Makefile b/gnu/usr.bin/diff/tests/Makefile
new file mode 100644
index 0000000..aa1629d
--- /dev/null
+++ b/gnu/usr.bin/diff/tests/Makefile
@@ -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>
OpenPOWER on IntegriCloud