From owner-svn-src-head@FreeBSD.ORG Fri Sep 12 09:50:33 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B12ABCEA; Fri, 12 Sep 2014 09:50:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82C05884; Fri, 12 Sep 2014 09:50:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8C9oXAQ021457; Fri, 12 Sep 2014 09:50:33 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8C9oWJp021452; Fri, 12 Sep 2014 09:50:32 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201409120950.s8C9oWJp021452@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Fri, 12 Sep 2014 09:50:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271459 - head/tools/regression/acltools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 09:50:33 -0000 Author: trasz Date: Fri Sep 12 09:50:32 2014 New Revision: 271459 URL: http://svnweb.freebsd.org/changeset/base/271459 Log: Fix ACL tests to correctly work with ZFS; previous version used wrong paths. PR: 191545 MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/tools/regression/acltools/01.t head/tools/regression/acltools/03.t head/tools/regression/acltools/04.t Modified: head/tools/regression/acltools/01.t ============================================================================== --- head/tools/regression/acltools/01.t Fri Sep 12 08:39:15 2014 (r271458) +++ head/tools/regression/acltools/01.t Fri Sep 12 09:50:32 2014 (r271459) @@ -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 Modified: head/tools/regression/acltools/03.t ============================================================================== --- head/tools/regression/acltools/03.t Fri Sep 12 08:39:15 2014 (r271458) +++ head/tools/regression/acltools/03.t Fri Sep 12 09:50:32 2014 (r271459) @@ -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 Modified: head/tools/regression/acltools/04.t ============================================================================== --- head/tools/regression/acltools/04.t Fri Sep 12 08:39:15 2014 (r271458) +++ head/tools/regression/acltools/04.t Fri Sep 12 09:50:32 2014 (r271459) @@ -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