提交 22669a04 编写于 作者: S Shawn Pearce 提交者: Junio C Hamano

Remove unnecessary output from t3600-rm.

Moved the setup commands into test_expect_success blocks so their
output is hidden unless -v is used.  This makes the test suite look
a little cleaner when the rm test-file setup step fails (and was
expected to fail for most cases).
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 cd01d944
...@@ -8,30 +8,34 @@ test_description='Test of the various options to git-rm.' ...@@ -8,30 +8,34 @@ test_description='Test of the various options to git-rm.'
. ./test-lib.sh . ./test-lib.sh
# Setup some files to be removed, some with funny characters # Setup some files to be removed, some with funny characters
touch -- foo bar baz 'space embedded' -q test_expect_success \
git-add -- foo bar baz 'space embedded' -q 'Initialize test directory' \
git-commit -m "add normal files" "touch -- foo bar baz 'space embedded' -q &&
test_tabs=y git-add -- foo bar baz 'space embedded' -q &&
if touch -- 'tab embedded' 'newline git-commit -m 'add normal files' &&
embedded' test_tabs=y &&
then if touch -- 'tab embedded' 'newline
git-add -- 'tab embedded' 'newline
embedded' embedded'
git-commit -m "add files with tabs and newlines" then
else git-add -- 'tab embedded' 'newline
say 'Your filesystem does not allow tabs in filenames.' embedded' &&
test_tabs=n git-commit -m 'add files with tabs and newlines'
fi else
say 'Your filesystem does not allow tabs in filenames.'
test_tabs=n
fi"
# Later we will try removing an unremovable path to make sure # Later we will try removing an unremovable path to make sure
# git-rm barfs, but if the test is run as root that cannot be # git-rm barfs, but if the test is run as root that cannot be
# arranged. # arranged.
: >test-file test_expect_success \
chmod a-w . 'Determine rm behavior' \
rm -f test-file ': >test-file
test -f test-file && test_failed_remove=y chmod a-w .
chmod 775 . rm -f test-file
rm -f test-file test -f test-file && test_failed_remove=y
chmod 775 .
rm -f test-file'
test_expect_success \ test_expect_success \
'Pre-check that foo exists and is in index before git-rm foo' \ 'Pre-check that foo exists and is in index before git-rm foo' \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册