From owner-svn-src-head@FreeBSD.ORG  Mon Dec 13 18:59:55 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4A50106564A;
	Mon, 13 Dec 2010 18:59:55 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D384F8FC17;
	Mon, 13 Dec 2010 18:59:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBDIxtR6091051;
	Mon, 13 Dec 2010 18:59:55 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBDIxtWu091049;
	Mon, 13 Dec 2010 18:59:55 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201012131859.oBDIxtWu091049@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 13 Dec 2010 18:59:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216414 - head/tools/regression/acltools
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Dec 2010 18:59:56 -0000

Author: trasz
Date: Mon Dec 13 18:59:55 2010
New Revision: 216414
URL: http://svn.freebsd.org/changeset/base/216414

Log:
  Recognize NFSv4 ACL semantics and run proper regression test.

Modified:
  head/tools/regression/acltools/02.t

Modified: head/tools/regression/acltools/02.t
==============================================================================
--- head/tools/regression/acltools/02.t	Mon Dec 13 18:56:04 2010	(r216413)
+++ head/tools/regression/acltools/02.t	Mon Dec 13 18:59:55 2010	(r216414)
@@ -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"