From f4f9f4ea0cfa3ebef252295a3ab9d6350819d736 Mon Sep 17 00:00:00 2001 From: trasz Date: Mon, 22 Sep 2014 13:07:55 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.freebsd.org/base/stable/10@271962 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- tools/regression/acltools/01.t | 2 +- tools/regression/acltools/03.t | 2 +- tools/regression/acltools/04.t | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/regression/acltools/01.t b/tools/regression/acltools/01.t index 00004afec..f84e0a98b 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 a577b7a05..a0b4199c2 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 ccb992803..1a1318347 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 -- 2.45.0