From da93f3e483d40a9764be0ea2763f14ca6bfec1f9 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 12 Mar 2016 19:00:42 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/stable/10@296746 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 tests/sys/acl/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/sys/acl/Makefile b/tests/sys/acl/Makefile
index 298b0a27c..d101088dc 100644
--- a/tests/sys/acl/Makefile
+++ b/tests/sys/acl/Makefile
@@ -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>
-- 
2.45.0