From: Michael J Gruber Date: Thu, 22 Apr 2010 20:45:23 GMT Subject: [PATCH v2] t1304,t2007: quell output to stdout and stderr Message-ID: <5ef48a01f29730a24b74d599bb9b89e77591decf.1271969046.git.git@drmicha.warpmail.net> In-Reply-To: <20100421151236.GB8726@progeny.tock> These tests send output to stdout or stderr even without -v. This is distracting because unexpected output flashing by during make test usually indicates problems. Shut them up unconditionally by integrating them in test code: In both cases, the output was due to intermediate commands in between the actual test cases. Helped-by: Jonathan Nieder Signed-off-by: Michael J Gruber --- t/t1304-default-acl.sh | 10 +++++++++- t/t2007-checkout-symlink.sh | 5 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh index 055ad00..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 .; 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 20f3343..e98ec4c 100755 --- a/t/t2007-checkout-symlink.sh +++ b/t/t2007-checkout-symlink.sh @@ -44,11 +44,10 @@ test_expect_success 'switch from symlink to dir' ' ' -rm -fr frotz xyzzy nitfol && -git checkout -f master || exit - test_expect_success 'switch from dir to symlink' ' + rm -fr frotz xyzzy nitfol && + git checkout -f master && git checkout side ' -- 1.7.1.rc1.248.gcefbb