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:
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

View File

@ -147,7 +147,7 @@ test_expect_success \
git cat-file $t $object || return 1
done <obj-list
} >current &&
diff expect current'
test_cmp expect current'
test_expect_success \
'use packed deltified (REF_DELTA) objects' \
@ -162,7 +162,7 @@ test_expect_success \
git cat-file $t $object || return 1
done <obj-list
} >current &&
diff expect current'
test_cmp expect current'
test_expect_success \
'use packed deltified (OFS_DELTA) objects' \
@ -177,7 +177,7 @@ test_expect_success \
git cat-file $t $object || return 1
done <obj-list
} >current &&
diff expect current'
test_cmp expect current'
unset GIT_OBJECT_DIRECTORY