diff options
| author | ngie <ngie@FreeBSD.org> | 2016-03-12 19:00:42 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-03-12 19:00:42 +0000 |
| commit | 9400610a2a693918af638e3c906bfb7292a401e1 (patch) | |
| tree | 7a92d0e188bc8dfad5c7d82d6051398726aa9f2c /tests/sys | |
| parent | 8f12226c9d73db1fc2107cb71ddcde6254a7e7f5 (diff) | |
| download | FreeBSD-src-9400610a2a693918af638e3c906bfb7292a401e1.zip FreeBSD-src-9400610a2a693918af638e3c906bfb7292a401e1.tar.gz | |
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
Diffstat (limited to 'tests/sys')
| -rw-r--r-- | tests/sys/acl/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/sys/acl/Makefile b/tests/sys/acl/Makefile index 298b0a2..d101088 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> |
