Date: Thu, 9 Oct 2014 00:32:34 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r272777 - in head: etc/mtree usr.sbin/nmtree usr.sbin/nmtree/tests Message-ID: <201410090032.s990WYBS013139@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Oct 9 00:32:33 2014 New Revision: 272777 URL: https://svnweb.freebsd.org/changeset/base/272777 Log: Integrate usr.sbin/nmtree/tests from NetBSD into atf/kyua In collaboration with: pho Sponsored by: EMC / Isilon Storage Division Added: head/usr.sbin/nmtree/tests/ head/usr.sbin/nmtree/tests/Makefile (contents, props changed) Modified: head/etc/mtree/BSD.tests.dist head/usr.sbin/nmtree/Makefile Modified: head/etc/mtree/BSD.tests.dist ============================================================================== --- head/etc/mtree/BSD.tests.dist Wed Oct 8 22:13:18 2014 (r272776) +++ head/etc/mtree/BSD.tests.dist Thu Oct 9 00:32:33 2014 (r272777) @@ -287,6 +287,8 @@ .. newsyslog .. + nmtree + .. pw .. sa Modified: head/usr.sbin/nmtree/Makefile ============================================================================== --- head/usr.sbin/nmtree/Makefile Wed Oct 8 22:13:18 2014 (r272776) +++ head/usr.sbin/nmtree/Makefile Thu Oct 9 00:32:33 2014 (r272777) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .PATH: ${.CURDIR}/../../contrib/mtree @@ -24,4 +24,8 @@ LDADD+= ${LIBNETBSD} LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree MLINKS= mtree.8 nmtree.8 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Added: head/usr.sbin/nmtree/tests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/nmtree/tests/Makefile Thu Oct 9 00:32:33 2014 (r272777) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410090032.s990WYBS013139>