summaryrefslogtreecommitdiff
path: root/t/t1304-default-acl.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-07 18:18:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-07 18:18:44 (GMT)
commit2a16315031cf478601ea150f7861d4f86b1350a2 (patch)
treea7bdc4b0d4cc28640a55a7689c0cccefecb3c642 /t/t1304-default-acl.sh
parentfcd91f8de20bf7969599a7a60cba73117d99f2d1 (diff)
parentc9667456d201c435af523ffb7d583efd1784232a (diff)
downloadgit-2a16315031cf478601ea150f7861d4f86b1350a2.zip
git-2a16315031cf478601ea150f7861d4f86b1350a2.tar.gz
git-2a16315031cf478601ea150f7861d4f86b1350a2.tar.bz2
Merge branch 'ab/tap'
* ab/tap: t/README: document more test helpers t/README: proposed rewording... t/README: Document the do's and don'ts of tests t/README: Add a section about skipping tests t/README: Document test_expect_code t/README: Document test_external* t/README: Document the prereq functions, and 3-arg test_* t/README: Typo: paralell -> parallel t/README: The trash is in 't/trash directory.$name' t/t9700/test.pl: don't access private object members, use public access methods t9700: Use Test::More->builder, not $Test::Builder::Test tests: Say "pass" rather than "ok" on empty lines for TAP tests: Skip tests in a way that makes sense under TAP test-lib: output a newline before "ok" under a TAP harness test-lib: Make the test_external_* functions TAP-aware test-lib: Adjust output to be valid TAP format
Diffstat (limited to 't/t1304-default-acl.sh')
-rwxr-xr-xt/t1304-default-acl.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index 055ad00..97ab02a 100755
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -15,9 +15,12 @@ umask 077
# is a good candidate: exists on all unices, and it has permission
# anyway, so we don't create a security hole running the testsuite.
-if ! setfacl -m u:root:rwx .; then
- say "Skipping ACL tests: unable to use setfacl"
- test_done
+setfacl_out="$(setfacl -m u:root:rwx . 2>&1)"
+setfacl_ret=$?
+
+if [ $setfacl_ret != 0 ]; then
+ skip_all="Skipping ACL tests: unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')"
+ test_done
fi
check_perms_and_acl () {