diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-06-24 17:44:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-25 10:08:20 -0700 |
| commit | fadb5156e485e9d25c89d4b4f96c2d4fe6db6187 (patch) | |
| tree | eb89a099061fc53a086a4a305bc517338b34f9b9 /t/t1304-default-acl.sh | |
| parent | 57e1538ac9b352c7a43ca63d8206c5393e04fab3 (diff) | |
| download | git-fadb5156e485e9d25c89d4b4f96c2d4fe6db6187.tar.gz git-fadb5156e485e9d25c89d4b4f96c2d4fe6db6187.tar.xz | |
tests: Skip tests in a way that makes sense under TAP
SKIP messages are now part of the TAP plan. A TAP harness now knows
why a particular test was skipped and can report that information. The
non-TAP harness built into Git's test-lib did nothing special with
these messages, and is unaffected by these changes.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1304-default-acl.sh')
| -rwxr-xr-x | t/t1304-default-acl.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh index 055ad00f7..97ab02ace 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 () { |