Author: trasz Date: Fri Sep 12 09:50:32 2014 New Revision: 271459 URL: http://svnweb.freebsd.org/changeset/base/271459
Log: Fix ACL tests to correctly work with ZFS; previous version used wrong paths. PR: 191545 MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/tools/regression/acltools/01.t head/tools/regression/acltools/03.t head/tools/regression/acltools/04.t Modified: head/tools/regression/acltools/01.t ============================================================================== --- head/tools/regression/acltools/01.t Fri Sep 12 08:39:15 2014 (r271458) +++ head/tools/regression/acltools/01.t Fri Sep 12 09:50:32 2014 (r271459) @@ -51,7 +51,7 @@ TESTDIR=$(dirname $(realpath $0)) # Set up the test filesystem. MD=`mdconfig -at swap -s 64m` MNT=`mktemp -dt acltools` -zpool create -R $MNT acltools /dev/$MD +zpool create -m $MNT acltools /dev/$MD if [ $? -ne 0 ]; then echo "not ok 1 - 'zpool create' failed." exit 1 Modified: head/tools/regression/acltools/03.t ============================================================================== --- head/tools/regression/acltools/03.t Fri Sep 12 08:39:15 2014 (r271458) +++ head/tools/regression/acltools/03.t Fri Sep 12 09:50:32 2014 (r271459) @@ -48,7 +48,7 @@ MNTROOT=`mktemp -dt acltools` MD1=`mdconfig -at swap -s 64m` MNT1=$MNTROOT/nfs4 mkdir $MNT1 -zpool create -R $MNT1 acltools /dev/$MD1 +zpool create -m $MNT1 acltools /dev/$MD1 if [ $? -ne 0 ]; then echo "not ok 1 - 'zpool create' failed." exit 1 Modified: head/tools/regression/acltools/04.t ============================================================================== --- head/tools/regression/acltools/04.t Fri Sep 12 08:39:15 2014 (r271458) +++ head/tools/regression/acltools/04.t Fri Sep 12 09:50:32 2014 (r271459) @@ -43,7 +43,7 @@ TESTDIR=$(dirname $(realpath $0)) # Set up the test filesystem. MD=`mdconfig -at swap -s 64m` MNT=`mktemp -dt acltools` -zpool create -R $MNT acltools /dev/$MD +zpool create -m $MNT acltools /dev/$MD if [ $? -ne 0 ]; then echo "not ok 1 - 'zpool create' failed." exit 1 _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"