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/t4132-apply-removal.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/t4132-apply-removal.sh')
-rwxr-xr-x | t/t4132-apply-removal.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t4132-apply-removal.sh b/t/t4132-apply-removal.sh index a2bc1cd..fec1d6f 100755 --- a/t/t4132-apply-removal.sh +++ b/t/t4132-apply-removal.sh @@ -49,8 +49,7 @@ test_expect_success setup ' sed -e "s/TS0/$timeGMT/" -e "s/TS1/$epocGMT/" <d >removeGMT.patch && sed -e "s/TS0/$timeWest/" -e "s/TS1/$epocWest2/" <d >removeWest2.patch && - echo something >something && - >empty + echo something >something ' for patch in *.patch @@ -81,7 +80,7 @@ do git add file && git apply --index $patch && test -f file && - test_cmp empty file + test_must_be_empty file ;; remove*) # must remove the file |