[Midnightbsd-cvs] src [10370] trunk/usr.sbin/nmtree: add nmtree

[laffer1 at midnightbsd.org]

Revision: 10370
          http://svnweb.midnightbsd.org/src/?rev=10370
Author:   laffer1
Date:     2018-06-03 19:15:31 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
add nmtree

Modified Paths:
--------------
    trunk/usr.sbin/nmtree/Makefile

Added Paths:
-----------
    trunk/usr.sbin/nmtree/tests/
    trunk/usr.sbin/nmtree/tests/Makefile

Modified: trunk/usr.sbin/nmtree/Makefile
===================================================================
--- trunk/usr.sbin/nmtree/Makefile	2018-06-03 23:13:43 UTC (rev 10369)
+++ trunk/usr.sbin/nmtree/Makefile	2018-06-03 23:15:31 UTC (rev 10370)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-#	$FreeBSD: release/9.2.0/usr.sbin/nmtree/Makefile 245241 2013-01-09 21:07:08Z brooks $
+#	$FreeBSD: stable/10/usr.sbin/nmtree/Makefile 276490 2015-01-01 02:04:44Z ngie $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,8 @@
 PROG=		nmtree
 MAN=		nmtree.8
 SRCS=		compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
-		spec.c specspec.c verify.c
+		only.c spec.c specspec.c verify.c
+DPADD+=		${LIBMD} ${LIBUTIL}
 LDADD+=		-lmd -lutil
 
 CFLAGS+=	-I${.CURDIR}/../../contrib/mknod
@@ -31,4 +32,8 @@
 nmtree.8: mtree.8
 	cp ${.ALLSRC} ${.TARGET}
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Added: trunk/usr.sbin/nmtree/tests/Makefile
===================================================================
--- trunk/usr.sbin/nmtree/tests/Makefile	                        (rev 0)
+++ trunk/usr.sbin/nmtree/tests/Makefile	2018-06-03 23:15:31 UTC (rev 10370)
@@ -0,0 +1,31 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/nmtree/tests/Makefile 313488 2017-02-09 22:49:48Z ngie $
+
+TESTSRC=	${SRCTOP}/contrib/netbsd-tests/usr.sbin/mtree
+.PATH: ${TESTSRC}
+
+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>


Property changes on: trunk/usr.sbin/nmtree/tests/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property