svn commit: r296746 - stable/10/tests/sys/acl

[Garrett Cooper]

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>