From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 22 13:07:56 2014 Return-Path: Delivered-To: svn-src-stable-10@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 9436F136; Mon, 22 Sep 2014 13:07:56 +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 650B15E2; Mon, 22 Sep 2014 13:07:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8MD7ul0079956; Mon, 22 Sep 2014 13:07:56 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8MD7trh079949; Mon, 22 Sep 2014 13:07:55 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201409221307.s8MD7trh079949@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 22 Sep 2014 13:07:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271962 - stable/10/tools/regression/acltools X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Sep 2014 13:07:56 -0000 Author: trasz Date: Mon Sep 22 13:07:55 2014 New Revision: 271962 URL: http://svnweb.freebsd.org/changeset/base/271962 Log: 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 Modified: stable/10/tools/regression/acltools/01.t stable/10/tools/regression/acltools/03.t stable/10/tools/regression/acltools/04.t Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/regression/acltools/01.t ============================================================================== --- stable/10/tools/regression/acltools/01.t Mon Sep 22 13:07:03 2014 (r271961) +++ stable/10/tools/regression/acltools/01.t Mon Sep 22 13:07:55 2014 (r271962) @@ -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: stable/10/tools/regression/acltools/03.t ============================================================================== --- stable/10/tools/regression/acltools/03.t Mon Sep 22 13:07:03 2014 (r271961) +++ stable/10/tools/regression/acltools/03.t Mon Sep 22 13:07:55 2014 (r271962) @@ -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: stable/10/tools/regression/acltools/04.t ============================================================================== --- stable/10/tools/regression/acltools/04.t Mon Sep 22 13:07:03 2014 (r271961) +++ stable/10/tools/regression/acltools/04.t Mon Sep 22 13:07:55 2014 (r271962) @@ -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