summaryrefslogtreecommitdiffstats
path: root/tools/regression
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2014-09-22 13:07:55 +0000
committertrasz <trasz@FreeBSD.org>2014-09-22 13:07:55 +0000
commitbff2829041c7e19356e6c424a8c1f2fb06126062 (patch)
tree862f2c6c2449e4abb86b19c59aacc3f608b951bc /tools/regression
parented8e08d5db88e85f0297ca7eb59f9837bcba8720 (diff)
downloadFreeBSD-src-bff2829041c7e19356e6c424a8c1f2fb06126062.zip
FreeBSD-src-bff2829041c7e19356e6c424a8c1f2fb06126062.tar.gz
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
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 00004af..f84e0a9 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 a577b7a..a0b4199 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 ccb9928..1a13183 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
OpenPOWER on IntegriCloud