diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-27 21:33:43 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-27 21:33:43 (GMT) |
commit | 986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a (patch) | |
tree | 4ef3f9805cfdbf3b4496cb720a94c138df034204 /t/t2204-add-ignored.sh | |
parent | fc0df933c8fa09603a9e9798085ee07ca1a83f65 (diff) | |
parent | 1c5e94f459a0b7c23ef7e855441a65afdc4effab (diff) | |
download | git-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.zip git-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.tar.gz git-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.tar.bz2 |
Merge branch 'sg/test-must-be-empty'
Test fixes.
* sg/test-must-be-empty:
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'
tests: use 'test_must_be_empty' instead of 'test ! -s'
tests: use 'test_must_be_empty' instead of '! test -s'
Diffstat (limited to 't/t2204-add-ignored.sh')
-rwxr-xr-x | t/t2204-add-ignored.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh index 8340ac2..2e07365 100755 --- a/t/t2204-add-ignored.sh +++ b/t/t2204-add-ignored.sh @@ -31,7 +31,7 @@ do rm -f .git/index && test_must_fail git add "$i" 2>err && git ls-files "$i" >out && - ! test -s out + test_must_be_empty out ' test_expect_success "complaints for ignored $i output" ' @@ -42,7 +42,7 @@ do rm -f .git/index && test_must_fail git add "$i" file 2>err && git ls-files "$i" >out && - ! test -s out + test_must_be_empty out ' test_expect_success "complaints for ignored $i with unignored file output" ' test_i18ngrep -e "Use -f if" err @@ -57,7 +57,7 @@ do cd dir && test_must_fail git add "$i" 2>err && git ls-files "$i" >out && - ! test -s out + test_must_be_empty out ) ' @@ -77,7 +77,7 @@ do cd sub && test_must_fail git add "$i" 2>err && git ls-files "$i" >out && - ! test -s out + test_must_be_empty out ) ' |