summaryrefslogtreecommitdiff
path: root/t/Makefile
diff options
context:
space:
mode:
authorGary V. Vaughan <git@mlists.thewrittenword.com>2010-05-14 09:31:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-01 00:36:27 (GMT)
commitb2b0026eede10894d3317920a277b2a579cd86c5 (patch)
tree22ddc55021665a7b1b55ae22d089f011bef2d655 /t/Makefile
parent7b3bdbb335b6be938b4748e86a41357e51c97804 (diff)
downloadgit-b2b0026eede10894d3317920a277b2a579cd86c5.zip
git-b2b0026eede10894d3317920a277b2a579cd86c5.tar.gz
git-b2b0026eede10894d3317920a277b2a579cd86c5.tar.bz2
test_cmp: do not use "diff -u" on platforms that lack one
By default the testsuite calls 'diff -u' whenever a file comparison is called for. Unfortunately that throws a "diff: unknown option '-u'" error for most non-GNU diffs. This patch sets GIT_TEST_CMP to 'cmp' on all the architectures where that happens. The previous version of this patch forgot to export GIT_TEST_CMP from t/Makefile, which is why 'make test' continued to fail most tests on most architectures - test-lib.sh was falling back on its default of `diff -u' for GIT_TEST_CMP. This version of this patch shows a vast improvement in testsuite results where either GNU diff is in the path at configure time, or where Makefile knows that GIT_TEST_CMP=cmp is required. 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/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/Makefile b/t/Makefile
index 25c559b..1729485 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -3,6 +3,7 @@
# Copyright (c) 2005 Junio C Hamano
#
+-include ../config.mak.autogen
-include ../config.mak
#GIT_TEST_OPTS=--verbose --debug