tests: use "test_cmp", not "diff", when verifying the result
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:

committed by
Junio C Hamano

parent
d1b1a91946
commit
4fdf71be1c
@ -135,7 +135,7 @@ cmp_diff_files_output () {
|
||||
# filesystem.
|
||||
sed <"$2" >.test-tmp \
|
||||
-e '/^:000000 /d;s/'$x40'\( [MCRNDU][0-9]*\) /'$z40'\1 /' &&
|
||||
diff "$1" .test-tmp
|
||||
test_cmp "$1" .test-tmp
|
||||
}
|
||||
|
||||
test_expect_success \
|
||||
|
Reference in New Issue
Block a user