diff options
| author | Gary V. Vaughan <git@mlists.thewrittenword.com> | 2010-05-14 09:31:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-31 16:59:27 -0700 |
| commit | 4fdf71be1ca3a817851a14f91b75e7d30f885a48 (patch) | |
| tree | 5e280e04305b3b1f019ce56e4293a01b77d152a2 /t/Makefile | |
| parent | d1b1a919461c2f00d4e10f5ba227b13f800a6ac3 (diff) | |
| download | git-4fdf71be1ca3a817851a14f91b75e7d30f885a48.tar.gz git-4fdf71be1ca3a817851a14f91b75e7d30f885a48.tar.xz | |
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/Makefile')
| -rw-r--r-- | t/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/Makefile b/t/Makefile index 25c559bb4..93a64750e 100644 --- a/t/Makefile +++ b/t/Makefile @@ -6,10 +6,14 @@ -include ../config.mak #GIT_TEST_OPTS=--verbose --debug +GIT_TEST_CMP ?= $(DIFF) SHELL_PATH ?= $(SHELL) TAR ?= $(TAR) RM ?= rm -f +# Make sure test-lib.sh uses make's value of GIT_TEST_CMP +export GIT_TEST_CMP + # Shell quote; SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) |