diff options
author | ngie <ngie@FreeBSD.org> | 2015-01-01 02:04:44 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-01-01 02:04:44 +0000 |
commit | 0971283da1a2343a9fa413073fcd4e1fe7d153ed (patch) | |
tree | f431d239ff3a5545c3648186537ddfe6a97dae6e /usr.sbin/nmtree | |
parent | a7ae9a638d5518687d8fddb26ebf58af5d3e6f2d (diff) | |
download | FreeBSD-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 'usr.sbin/nmtree')
-rw-r--r-- | usr.sbin/nmtree/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/nmtree/tests/Makefile | 32 |
2 files changed, 36 insertions, 0 deletions
diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile index f829769..0530d9e 100644 --- a/usr.sbin/nmtree/Makefile +++ b/usr.sbin/nmtree/Makefile @@ -31,4 +31,8 @@ CLEANFILES+= nmtree.8 nmtree.8: mtree.8 cp ${.ALLSRC} ${.TARGET} +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> diff --git a/usr.sbin/nmtree/tests/Makefile b/usr.sbin/nmtree/tests/Makefile new file mode 100644 index 0000000..1df81d0 --- /dev/null +++ b/usr.sbin/nmtree/tests/Makefile @@ -0,0 +1,32 @@ +# $FreeBSD$ + +TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/mtree +.PATH: ${TESTSRC} + +TESTSDIR= ${TESTSBASE}/usr.sbin/nmtree + +ATF_TESTS_SH= nmtree_test +ATF_TESTS_SH_SRC_nmtree_test= t_mtree.sh + +FILESDIR= ${TESTSDIR} + +# NOTE: the output from FreeBSD's nmtree displays sha256digest instead of +# sha256; we need to mangle the specfiles to reflect this. +.for f in mtree_d_create.out netbsd6_d_create.out +CLEANFILES+= $f $f.tmp +FILES+= $f +$f: ${TESTSRC}/$f + sed -e 's/sha256/sha256digest/g' < ${.ALLSRC} > ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} +.endfor + +FILES+= d_convert.in +FILES+= d_convert_C.out +FILES+= d_convert_C_S.out +FILES+= d_convert_D.out +FILES+= d_convert_D_S.out +FILES+= d_merge.in +FILES+= d_merge_C_M.out +FILES+= d_merge_C_M_S.out + +.include <bsd.test.mk> |