From owner-svn-src-stable@freebsd.org  Sat Mar 12 19:00:44 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C054ACCA61;
 Sat, 12 Mar 2016 19:00:44 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 DD8B3A0C;
 Sat, 12 Mar 2016 19:00:43 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJ0gpn070576;
 Sat, 12 Mar 2016 19:00:42 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJ0gif070575;
 Sat, 12 Mar 2016 19:00:42 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201603121900.u2CJ0gif070575@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 12 Mar 2016 19:00:42 +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: r296746 - stable/10/tests/sys/acl
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@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Mar 2016 19:00:44 -0000

Author: ngie
Date: Sat Mar 12 19:00:42 2016
New Revision: 296746
URL: https://svnweb.freebsd.org/changeset/base/296746

Log:
  MFC r295341,r295345:
  
  r295341:
  
  Require /bin/getfacl and /bin/setfacl when running the acl tests
  
  For cases where these utilities aren't installed, the tests would fail today
  in a non-intuitive manner on sub-testcase #3 in each of the test scripts
  
  r295345:
  
  Use basenames for getfacl, setfacl, and zpool to work around the
  fact that Jenkins hardcodes image sizes to 2GB with the FreeBSD_HEAD
  job
  
  This is to stop the unnecessary failure emails because we've gone
  over the 2GB limit

Modified:
  stable/10/tests/sys/acl/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tests/sys/acl/Makefile
==============================================================================
--- stable/10/tests/sys/acl/Makefile	Sat Mar 12 18:59:56 2016	(r296745)
+++ stable/10/tests/sys/acl/Makefile	Sat Mar 12 19:00:42 2016	(r296746)
@@ -22,8 +22,14 @@ TAP_TESTS_SH+=	04
 TEST_METADATA.$t+=	required_user="root"
 .endfor
 
+_ACL_PROGS=		getfacl setfacl
+
 .for t in 01 03 04
-TEST_METADATA.$t+=	required_programs="/sbin/zpool"
+TEST_METADATA.$t+=	required_programs="zpool ${_ACL_PROGS}"
+.endfor
+
+.for t in 00 02
+TEST_METADATA.$t+=	required_programs="${_ACL_PROGS}"
 .endfor
 
 .include <bsd.test.mk>