mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: use "test_cmp", not "diff", when verifying the result

Browse Source 
In tests, call test_cmp rather than raw diff where possible (i.e. if
the output does not go to a pipe), to allow the use of, say, 'cmp'
when the default 'diff -u' is not compatible with a vendor diff.

When that is not possible, use $DIFF, as set in GIT-BUILD-OPTIONS.

Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Gary V. Vaughan
2010-05-14 09:31:37 +00:00
committed by Junio C Hamano
parent d1b1a91946
commit 4fdf71be1c
19 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t6022-merge-rename.sh
View File

@ -280,7 +280,7 @@ test_expect_success 'updated working tree file should prevent the merge' '
echo "BAD: should have complained"
return 1
}
diff M M.saved || {
test_cmp M M.saved || {
echo "BAD: should have left M intact"
return 1
}
@ -301,7 +301,7 @@ test_expect_success 'updated working tree file should prevent the merge' '
echo "BAD: should have complained"
return 1
}
diff M M.saved || {
test_cmp M M.saved || {
echo "BAD: should have left M intact"
return 1
}