[PATCH 1/7] t/t1304-default-acl: change from skip_all=* to prereq skip
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Aug 10, 2010, 19:52 UTC
- Message-ID
- <1281469968-25670-2-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1281469968-25670-1-git-send-email-avarab@gmail.com>
Change this test to skip test with test prerequisites, and to do setup work in tests. This improves the skipped statistics on platforms where the test isn't run.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/t1304-default-acl.sh | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh index 97ab02a..0e6cb4f 100755 --- a/t/t1304-default-acl.sh +++ b/t/t1304-default-acl.sh @@ -18,11 +18,14 @@ umask 077 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 +if test $setfacl_ret != 0 +then + say "Unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')" +else + test_set_prereq SETFACL fi + check_perms_and_acl () { test -r "$1" && getfacl "$1" > actual && @@ -34,7 +37,7 @@ check_perms_and_acl () { dirs_to_set="./ .git/ .git/objects/ .git/objects/pack/" -test_expect_success 'Setup test repo' ' +test_expect_success SETFACL 'Setup test repo' ' setfacl -m d:u::rwx,d:g::---,d:o:---,d:m:rwx $dirs_to_set && setfacl -m m:rwx $dirs_to_set && setfacl -m u:root:rwx $dirs_to_set && @@ -46,12 +49,12 @@ test_expect_success 'Setup test repo' ' git commit -m "init" ' -test_expect_success 'Objects creation does not break ACLs with restrictive umask' ' +test_expect_success SETFACL 'Objects creation does not break ACLs with restrictive umask' ' # SHA1 for empty blob check_perms_and_acl .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 ' -test_expect_success 'git gc does not break ACLs with restrictive umask' ' +test_expect_success SETFACL 'git gc does not break ACLs with restrictive umask' ' git gc && check_perms_and_acl .git/objects/pack/*.pack '
-- 1.7.2.1.295.gd03d