summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2010-12-13 18:59:55 +0000
committertrasz <trasz@FreeBSD.org>2010-12-13 18:59:55 +0000
commita928bab70b1cae329a6ba8208e3d745b38a8b190 (patch)
tree6a5458be5ef78be3211214381d53171d52d6fa13
parent6be0018c93cdc928169ebbbead228dd9ecdb7ff0 (diff)
downloadFreeBSD-src-a928bab70b1cae329a6ba8208e3d745b38a8b190.zip
FreeBSD-src-a928bab70b1cae329a6ba8208e3d745b38a8b190.tar.gz
Recognize NFSv4 ACL semantics and run proper regression test.
-rw-r--r--tools/regression/acltools/02.t6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/regression/acltools/02.t b/tools/regression/acltools/02.t
index 431375e..aeef8dc 100644
--- a/tools/regression/acltools/02.t
+++ b/tools/regression/acltools/02.t
@@ -69,7 +69,11 @@ chmod 600 xxx
rm xxx
echo "ok 2"
-perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null
+if [ `sysctl -n vfs.acl_nfs4_old_semantics` = 0 ]; then
+ perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null
+else
+ perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null
+fi
if [ $? -eq 0 ]; then
echo "ok 3"
OpenPOWER on IntegriCloud