Date: Fri, 21 Sep 2012 19:27:14 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r240787 - in projects/mtree/usr.sbin/nmtree: . test Message-ID: <201209211927.q8LJRE0e091855@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Sep 21 19:27:13 2012 New Revision: 240787 URL: http://svn.freebsd.org/changeset/base/240787 Log: Hook specspec.c up to the build. Added: projects/mtree/usr.sbin/nmtree/test/ - copied from r240761, projects/mtree/usr.sbin/mtree/test/ Modified: projects/mtree/usr.sbin/nmtree/Makefile projects/mtree/usr.sbin/nmtree/test/test00.sh projects/mtree/usr.sbin/nmtree/test/test01.sh projects/mtree/usr.sbin/nmtree/test/test02.sh projects/mtree/usr.sbin/nmtree/test/test03.sh projects/mtree/usr.sbin/nmtree/test/test04.sh projects/mtree/usr.sbin/nmtree/test/test05.sh Modified: projects/mtree/usr.sbin/nmtree/Makefile ============================================================================== --- projects/mtree/usr.sbin/nmtree/Makefile Fri Sep 21 19:26:21 2012 (r240786) +++ projects/mtree/usr.sbin/nmtree/Makefile Fri Sep 21 19:27:13 2012 (r240787) @@ -11,7 +11,8 @@ CFLAGS+= -DNO_SHA384 -I${.CURDIR} LDADD+= -lmd -lutil #MAN= mtree.8 MAN= -SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c \ +SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c specspec.c \ + verify.c \ getid.c pack_dev.c SRCS+= sha1.h sha2.h util.c util.h Modified: projects/mtree/usr.sbin/nmtree/test/test00.sh ============================================================================== --- projects/mtree/usr.sbin/mtree/test/test00.sh Thu Sep 20 18:42:00 2012 (r240761) +++ projects/mtree/usr.sbin/nmtree/test/test00.sh Fri Sep 21 19:27:13 2012 (r240787) @@ -18,7 +18,7 @@ mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt mkdir ${TMP}/mt/foo mkdir ${TMP}/mr/\* -mtree -c -p ${TMP}/mr | mtree -U -r -p ${TMP}/mt > /dev/null 2>&1 +nmtree -c -p ${TMP}/mr | nmtree -U -r -p ${TMP}/mt > /dev/null 2>&1 if [ -d ${TMP}/mt/foo ] ; then echo "ERROR Mtree create fell for filename with '*' char" 1>&2 rm -rf ${TMP} @@ -28,7 +28,7 @@ rmdir ${TMP}/mr/\* mkdir -p ${TMP}/mt/foo mkdir ${TMP}/mr/\[f\]oo -mtree -c -p ${TMP}/mr | mtree -U -r -p ${TMP}/mt > /dev/null 2>&1 +nmtree -c -p ${TMP}/mr | nmtree -U -r -p ${TMP}/mt > /dev/null 2>&1 if [ -d ${TMP}/mt/foo ] ; then echo "ERROR Mtree create fell for filename with '[' char" 1>&2 rm -rf ${TMP} @@ -38,7 +38,7 @@ rmdir ${TMP}/mr/\[f\]oo mkdir -p ${TMP}/mt/foo mkdir ${TMP}/mr/\?oo -mtree -c -p ${TMP}/mr | mtree -U -r -p ${TMP}/mt > /dev/null 2>&1 +nmtree -c -p ${TMP}/mr | nmtree -U -r -p ${TMP}/mt > /dev/null 2>&1 if [ -d ${TMP}/mt/foo ] ; then echo "ERROR Mtree create fell for filename with '?' char" 1>&2 rm -rf ${TMP} @@ -47,8 +47,8 @@ fi rmdir ${TMP}/mr/\?oo mkdir ${TMP}/mr/\# -mtree -c -p ${TMP}/mr > ${TMP}/_ -if mtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null 2>&1 ; then +nmtree -c -p ${TMP}/mr > ${TMP}/_ +if nmtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null 2>&1 ; then true else echo "ERROR Mtree create fell for filename with '#' char" 1>&2 Modified: projects/mtree/usr.sbin/nmtree/test/test01.sh ============================================================================== --- projects/mtree/usr.sbin/mtree/test/test01.sh Thu Sep 20 18:42:00 2012 (r240761) +++ projects/mtree/usr.sbin/nmtree/test/test01.sh Fri Sep 21 19:27:13 2012 (r240787) @@ -17,9 +17,9 @@ mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt ln -s "xx this=is=wrong" ${TMP}/mr/foo -mtree -c -p ${TMP}/mr > ${TMP}/_ +nmtree -c -p ${TMP}/mr > ${TMP}/_ -if mtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null 2>&1 ; then +if nmtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null 2>&1 ; then true else echo "ERROR Mtree failed on symlink with space char" 1>&2 Modified: projects/mtree/usr.sbin/nmtree/test/test02.sh ============================================================================== --- projects/mtree/usr.sbin/mtree/test/test02.sh Thu Sep 20 18:42:00 2012 (r240761) +++ projects/mtree/usr.sbin/nmtree/test/test02.sh Fri Sep 21 19:27:13 2012 (r240787) @@ -18,9 +18,9 @@ mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt touch -t 199901020304 ${TMP}/mr/oldfile touch ${TMP}/mt/oldfile -mtree -c -p ${TMP}/mr > ${TMP}/_ +nmtree -c -p ${TMP}/mr > ${TMP}/_ -mtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null +nmtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null x=x`(cd ${TMP}/mr ; ls -l 2>&1) || true` y=x`(cd ${TMP}/mt ; ls -l 2>&1) || true` Modified: projects/mtree/usr.sbin/nmtree/test/test03.sh ============================================================================== --- projects/mtree/usr.sbin/mtree/test/test03.sh Thu Sep 20 18:42:00 2012 (r240761) +++ projects/mtree/usr.sbin/nmtree/test/test03.sh Fri Sep 21 19:27:13 2012 (r240787) @@ -14,8 +14,9 @@ TMP=/tmp/mtree.$$ rm -rf ${TMP} mkdir -p ${TMP} +echo ${TMP} -K=uid,uname,gid,gname,flags,md5digest,size,ripemd160digest,sha1digest,sha256digest,cksum +K=uid,uname,gid,gname,flags,size,cksum rm -rf _FOO mkdir _FOO @@ -24,8 +25,8 @@ touch _FOO/_size touch _FOO/zztype touch _FOO/_bar -mtree -c -K $K -p .. > ${TMP}/_r -mtree -c -K $K -p .. > ${TMP}/_r2 +nmtree -c -K $K -p .. > ${TMP}/_r +nmtree -c -K $K -p .. > ${TMP}/_r2 rm -rf _FOO/_bar rm -rf _FOO/zztype @@ -36,18 +37,18 @@ date > _FOO/_size chown nobody _FOO/_uid touch _FOO/_foo -mtree -c -K $K -p .. > ${TMP}/_t +nmtree -c -K $K -p .. > ${TMP}/_t rm -fr _FOO -if mtree -f ${TMP}/_r -f ${TMP}/_r2 ; then +if nmtree -f ${TMP}/_r -f ${TMP}/_r2 ; then true else echo "ERROR Compare identical failed" 1>&2 exit 1 fi -if mtree -f ${TMP}/_r -f ${TMP}/_t > ${TMP}/_ ; then +if nmtree -f ${TMP}/_r -f ${TMP}/_t > ${TMP}/_ ; then echo "ERROR Compare different succeeded" 1>&2 exit 1 fi Modified: projects/mtree/usr.sbin/nmtree/test/test04.sh ============================================================================== --- projects/mtree/usr.sbin/mtree/test/test04.sh Thu Sep 20 18:42:00 2012 (r240761) +++ projects/mtree/usr.sbin/nmtree/test/test04.sh Fri Sep 21 19:27:13 2012 (r240787) @@ -21,10 +21,10 @@ mkdir ${TMP}/mt/a mkdir ${TMP}/mt/b touch ${TMP}/mt/z -mtree -c -p ${TMP}/mr > ${TMP}/_r -mtree -c -p ${TMP}/mt > ${TMP}/_t +nmtree -c -p ${TMP}/mr > ${TMP}/_r +nmtree -c -p ${TMP}/mt > ${TMP}/_t -if mtree -f ${TMP}/_r -f ${TMP}/_t > ${TMP}/_ ; then +if nmtree -f ${TMP}/_r -f ${TMP}/_t > ${TMP}/_ ; then echo "ERROR wrong exit on difference" 1>&2 exit 1 fi @@ -35,7 +35,7 @@ if [ `wc -l < ${TMP}/_` -ne 1 ] ; then exit 1 fi -if mtree -f ${TMP}/_t -f ${TMP}/_r > ${TMP}/_ ; then +if nmtree -f ${TMP}/_t -f ${TMP}/_r > ${TMP}/_ ; then echo "ERROR wrong exit on difference" 1>&2 exit 1 fi Modified: projects/mtree/usr.sbin/nmtree/test/test05.sh ============================================================================== --- projects/mtree/usr.sbin/mtree/test/test05.sh Thu Sep 20 18:42:00 2012 (r240761) +++ projects/mtree/usr.sbin/nmtree/test/test05.sh Fri Sep 21 19:27:13 2012 (r240787) @@ -9,9 +9,9 @@ TMP=`mktemp -d /tmp/mtree.XXXXXX` mkdir -p ${TMP}/mr ${TMP}/mr/optional-dir ${TMP}/mr/some-dir touch ${TMP}/mr/optional-file ${TMP}/mr/some-file -mtree -c -p ${TMP}/mr > ${TMP}/_ +nmtree -c -p ${TMP}/mr > ${TMP}/_ rm -rf ${TMP}/mr/optional-file ${TMP}/mr/optional-dir -mtree -p ${TMP}/mr -K optional < ${TMP}/_ > /dev/null +nmtree -p ${TMP}/mr -K optional < ${TMP}/_ > /dev/null res=$?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209211927.q8LJRE0e091855>