]> git.ipfire.org Git - thirdparty/git.git/commit - t/Makefile
test_cmp: do not use "diff -u" on platforms that lack one
authorGary V. Vaughan <git@mlists.thewrittenword.com>
Fri, 14 May 2010 09:31:38 +0000 (09:31 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jun 2010 00:36:27 +0000 (17:36 -0700)
commitb2b0026eede10894d3317920a277b2a579cd86c5
tree22ddc55021665a7b1b55ae22d089f011bef2d655
parent7b3bdbb335b6be938b4748e86a41357e51c97804
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>
Makefile
t/Makefile