diff options
| author | Brian Gernhardt <brian@gernhardtsoftware.com> | 2010-03-20 04:29:11 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 09:15:17 -0700 |
| commit | 4a45f7dd49ba9a8943ad9b11fb7bed04f0cb4f15 (patch) | |
| tree | 5e82ea57ee14ac7fadbd84d1543896b3e581c85c /t/t4103-apply-binary.sh | |
| parent | a673cfede6987ee815de9189eab054fc462e5c9f (diff) | |
| download | git-4a45f7dd49ba9a8943ad9b11fb7bed04f0cb4f15.tar.gz git-4a45f7dd49ba9a8943ad9b11fb7bed04f0cb4f15.tar.xz | |
Use test_expect_success for test setups
Several tests did not use test_expect_success for their setup
commands. Putting these start commands into the testing framework
means both that errors during setup will be caught quickly and that
non-error text will be suppressed without -v.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4103-apply-binary.sh')
| -rwxr-xr-x | t/t4103-apply-binary.sh | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh index ad4cc1a75..9692f16f3 100755 --- a/t/t4103-apply-binary.sh +++ b/t/t4103-apply-binary.sh @@ -20,23 +20,25 @@ EOF cat file1 >file2 cat file1 >file4 -git update-index --add --remove file1 file2 file4 -git commit -m 'Initial Version' 2>/dev/null - -git checkout -b binary -perl -pe 'y/x/\000/' <file1 >file3 -cat file3 >file4 -git add file2 -perl -pe 'y/\000/v/' <file3 >file1 -rm -f file2 -git update-index --add --remove file1 file2 file3 file4 -git commit -m 'Second Version' - -git diff-tree -p master binary >B.diff -git diff-tree -p -C master binary >C.diff - -git diff-tree -p --binary master binary >BF.diff -git diff-tree -p --binary -C master binary >CF.diff +test_expect_success 'setup' " + git update-index --add --remove file1 file2 file4 && + git commit -m 'Initial Version' 2>/dev/null && + + git checkout -b binary && + perl -pe 'y/x/\000/' <file1 >file3 && + cat file3 >file4 && + git add file2 && + perl -pe 'y/\000/v/' <file3 >file1 && + rm -f file2 && + git update-index --add --remove file1 file2 file3 file4 && + git commit -m 'Second Version' && + + git diff-tree -p master binary >B.diff && + git diff-tree -p -C master binary >C.diff && + + git diff-tree -p --binary master binary >BF.diff && + git diff-tree -p --binary -C master binary >CF.diff +" test_expect_success 'stat binary diff -- should not fail.' \ 'git checkout master |