summaryrefslogtreecommitdiff
path: root/t/t4002-diff-basic.sh
diff options
context:
space:
mode:
authorGary V. Vaughan <git@mlists.thewrittenword.com>2010-05-14 09:31:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-31 23:59:27 (GMT)
commit4fdf71be1ca3a817851a14f91b75e7d30f885a48 (patch)
tree5e280e04305b3b1f019ce56e4293a01b77d152a2 /t/t4002-diff-basic.sh
parentd1b1a919461c2f00d4e10f5ba227b13f800a6ac3 (diff)
downloadgit-4fdf71be1ca3a817851a14f91b75e7d30f885a48.zip
git-4fdf71be1ca3a817851a14f91b75e7d30f885a48.tar.gz
git-4fdf71be1ca3a817851a14f91b75e7d30f885a48.tar.bz2
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>
Diffstat (limited to 't/t4002-diff-basic.sh')
-rwxr-xr-xt/t4002-diff-basic.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index 18695ce..73441a5 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -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 \