From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 1/7] t/t1304-default-acl: change from skip_all=* to prereq skip
Date: Wed, 11 Aug 2010 19:04:04 +0000 [thread overview]
Message-ID: <1281553450-26467-2-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <7vd3tpxao1.fsf@alter.siamese.dyndns.org>
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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index 97ab02a..b5d89a2 100755
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -18,9 +18,11 @@ 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 () {
@@ -34,7 +36,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 +48,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.gdf931
next prev parent reply other threads:[~2010-08-11 19:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 19:52 [PATCH 0/7] tests: use skip_all=* to skip tests Ævar Arnfjörð Bjarmason
2010-08-10 19:52 ` [PATCH 1/7] t/t1304-default-acl: change from skip_all=* to prereq skip Ævar Arnfjörð Bjarmason
2010-08-10 19:52 ` [PATCH 2/7] t/t5705-clone-2gb: " Ævar Arnfjörð Bjarmason
2010-08-11 18:32 ` Junio C Hamano
2010-08-10 19:52 ` [PATCH 3/7] t/t7005-editor: " Ævar Arnfjörð Bjarmason
2010-08-10 19:52 ` [PATCH 4/7] t/t5503-tagfollow: " Ævar Arnfjörð Bjarmason
2010-08-11 18:32 ` Junio C Hamano
2010-08-11 18:47 ` Ævar Arnfjörð Bjarmason
2010-08-12 17:23 ` Junio C Hamano
2010-08-11 20:20 ` Johannes Sixt
2010-08-10 19:52 ` [PATCH 5/7] t/t4016-diff-quote: " Ævar Arnfjörð Bjarmason
2010-08-11 18:32 ` Junio C Hamano
2010-08-10 19:52 ` [PATCH 6/7] t/t3902-quoted: " Ævar Arnfjörð Bjarmason
2010-08-10 19:52 ` [PATCH 7/7] t/t3300-funny-names: " Ævar Arnfjörð Bjarmason
2010-08-11 18:32 ` [PATCH 0/7] tests: use skip_all=* to skip tests Junio C Hamano
2010-08-11 19:04 ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2010-08-12 6:22 ` case where diff output needs improving? (was Re: [PATCH v2 0/7] tests: use skip_all=* to skip tests) Raja R Harinath
2010-08-12 6:43 ` Ævar Arnfjörð Bjarmason
2010-08-11 19:04 ` Ævar Arnfjörð Bjarmason [this message]
2010-08-11 19:04 ` [PATCH v2 2/7] t/t5705-clone-2gb: change from skip_all=* to prereq skip Ævar Arnfjörð Bjarmason
2010-08-11 19:04 ` [PATCH v2 3/7] t/t7005-editor: " Ævar Arnfjörð Bjarmason
2010-08-11 19:04 ` [PATCH v2 4/7] t/t5503-tagfollow: " Ævar Arnfjörð Bjarmason
2010-08-11 19:04 ` [PATCH v2 5/7] t/t4016-diff-quote: " Ævar Arnfjörð Bjarmason
2010-08-11 19:04 ` [PATCH v2 6/7] t/t3902-quoted: " Ævar Arnfjörð Bjarmason
2010-08-11 19:04 ` [PATCH v2 7/7] t/t3300-funny-names: " Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1281553450-26467-2-git-send-email-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).