svn commit: r271962 - stable/10/tools/regression/acltools

Edward Tomasz Napierala trasz at FreeBSD.org
Mon Sep 22 13:07:56 UTC 2014


Author: trasz
Date: Mon Sep 22 13:07:55 2014
New Revision: 271962
URL: http://svnweb.freebsd.org/changeset/base/271962

Log:
  MFC r271459:
  
  Fix ACL tests to correctly work with ZFS; previous version used wrong
  paths.
  
  PR:		191545
  Approved by:	re (gjb)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/tools/regression/acltools/01.t
  stable/10/tools/regression/acltools/03.t
  stable/10/tools/regression/acltools/04.t
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tools/regression/acltools/01.t
==============================================================================
--- stable/10/tools/regression/acltools/01.t	Mon Sep 22 13:07:03 2014	(r271961)
+++ stable/10/tools/regression/acltools/01.t	Mon Sep 22 13:07:55 2014	(r271962)
@@ -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: stable/10/tools/regression/acltools/03.t
==============================================================================
--- stable/10/tools/regression/acltools/03.t	Mon Sep 22 13:07:03 2014	(r271961)
+++ stable/10/tools/regression/acltools/03.t	Mon Sep 22 13:07:55 2014	(r271962)
@@ -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: stable/10/tools/regression/acltools/04.t
==============================================================================
--- stable/10/tools/regression/acltools/04.t	Mon Sep 22 13:07:03 2014	(r271961)
+++ stable/10/tools/regression/acltools/04.t	Mon Sep 22 13:07:55 2014	(r271962)
@@ -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


More information about the svn-src-all mailing list