Hi Michael,
Michael J Gruber wrote:
> --- a/t/t1304-default-acl.sh
> +++ b/t/t1304-default-acl.sh
> @@ -15,7 +15,7 @@ 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
> +if ! setfacl -m u:root:rwx . 2>/dev/null; then
> say "Skipping ACL tests: unable to use setfacl"
> test_done
> fi
[and a similar suppression of ‘git checkout’ output]
In the spirit of commit 4a45f7d (Use test_expect_success for test
setups, 2010-03-20), might it make sense to turn these into tests?
I am imagining something like this.
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index b26d2e8..8b3ff7a 100755
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -15,7 +15,15 @@ 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 . 2>/dev/null; then
+test_expect_success 'Setup: try to set an ACL' '
+ if setfacl -m u:root:rwx .
+ then
+ test_set_prereq ACL
+ fi
+'
+
+if ! test_have_prereq ACL
+then
say "Skipping ACL tests: unable to use setfacl"
test_done
fi
diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh
index fc5db05..f8f40e5 100755
--- a/t/t2007-checkout-symlink.sh
+++ b/t/t2007-checkout-symlink.sh
@@ -44,11 +44,12 @@ test_expect_success 'switch from symlink to dir' '
'
-rm -fr frotz xyzzy nitfol &&
-git checkout -q -f master || exit
-
test_expect_success 'switch from dir to symlink' '
+ rm -fr frotz xyzzy nitfol &&
+ git rm -fr . &&
+ git checkout -f master &&
+
git checkout side
'
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html