aboutsummaryrefslogtreecommitdiff
path: root/tools/regression
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2014-09-12 09:50:32 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2014-09-12 09:50:32 +0000
commita3507e3bc81f289f912483abb59462a2677dbf22 (patch)
tree77d5e1a6a6a853879020be13a5b459a84c48d265 /tools/regression
parent450cecf0a0935f59d72e51726f3b3e4e211c5bd5 (diff)
downloadsrc-a3507e3bc81f289f912483abb59462a2677dbf22.tar.gz
src-a3507e3bc81f289f912483abb59462a2677dbf22.zip
Fix ACL tests to correctly work with ZFS; previous version used wrong
paths. PR: 191545 MFC after: 1 week Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=271459
Diffstat (limited to 'tools/regression')
-rw-r--r--tools/regression/acltools/01.t2
-rw-r--r--tools/regression/acltools/03.t2
-rw-r--r--tools/regression/acltools/04.t2
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/regression/acltools/01.t b/tools/regression/acltools/01.t
index 00004afece8b..f84e0a98b463 100644
--- a/tools/regression/acltools/01.t
+++ b/tools/regression/acltools/01.t
@@ -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
diff --git a/tools/regression/acltools/03.t b/tools/regression/acltools/03.t
index a577b7a0541f..a0b4199c2bf2 100644
--- a/tools/regression/acltools/03.t
+++ b/tools/regression/acltools/03.t
@@ -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
diff --git a/tools/regression/acltools/04.t b/tools/regression/acltools/04.t
index ccb992803ba1..1a13183475fe 100644
--- a/tools/regression/acltools/04.t
+++ b/tools/regression/acltools/04.t
@@ -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