diff options
| author | Shawn Pearce <spearce@spearce.org> | 2006-05-29 04:06:48 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-29 11:31:58 -0700 |
| commit | 22669a045a062c7884735219bc4f5f8a8dd183a2 (patch) | |
| tree | 893aa5a919d0314b7ed32619432ba311fe2d5905 | |
| parent | cd01d9445de1bbca8952c7ee16941f5fa10747f5 (diff) | |
| download | git-22669a045a062c7884735219bc4f5f8a8dd183a2.tar.gz git-22669a045a062c7884735219bc4f5f8a8dd183a2.tar.xz | |
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: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | t/t3600-rm.sh | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index acaa4d6bd..201d1642d 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -8,30 +8,34 @@ test_description='Test of the various options to git-rm.' . ./test-lib.sh # Setup some files to be removed, some with funny characters -touch -- foo bar baz 'space embedded' -q -git-add -- foo bar baz 'space embedded' -q -git-commit -m "add normal files" -test_tabs=y -if touch -- 'tab embedded' 'newline -embedded' -then -git-add -- 'tab embedded' 'newline +test_expect_success \ + 'Initialize test directory' \ + "touch -- foo bar baz 'space embedded' -q && + git-add -- foo bar baz 'space embedded' -q && + git-commit -m 'add normal files' && + test_tabs=y && + if touch -- 'tab embedded' 'newline embedded' -git-commit -m "add files with tabs and newlines" -else - say 'Your filesystem does not allow tabs in filenames.' - test_tabs=n -fi + then + git-add -- 'tab embedded' 'newline +embedded' && + git-commit -m 'add files with tabs and newlines' + 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 # git-rm barfs, but if the test is run as root that cannot be # arranged. -: >test-file -chmod a-w . -rm -f test-file -test -f test-file && test_failed_remove=y -chmod 775 . -rm -f test-file +test_expect_success \ + 'Determine rm behavior' \ + ': >test-file + chmod a-w . + rm -f test-file + test -f test-file && test_failed_remove=y + chmod 775 . + rm -f test-file' test_expect_success \ 'Pre-check that foo exists and is in index before git-rm foo' \ |