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>

diff --git a/Makefile b/Makefile
index c8cc9e280adf309a1f14271adebd3f5c364d4b0f..c7e757720378afa484d4969308607dd097db84d7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -815,18 +815,21 @@ ifeq ($(uname_S),SunOS)
                NO_STRLCPY = YesPlease
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease
                NO_STRLCPY = YesPlease
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease

+               GIT_TEST_CMP = cmp

        endif
        ifeq ($(uname_R),5.8)
                NO_UNSETENV = YesPlease
                NO_SETENV = YesPlease
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease
        endif
        ifeq ($(uname_R),5.8)
                NO_UNSETENV = YesPlease
                NO_SETENV = YesPlease
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease

+               GIT_TEST_CMP = cmp

        endif
        ifeq ($(uname_R),5.9)
                NO_UNSETENV = YesPlease
                NO_SETENV = YesPlease
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease
        endif
        ifeq ($(uname_R),5.9)
                NO_UNSETENV = YesPlease
                NO_SETENV = YesPlease
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease

+               GIT_TEST_CMP = cmp

        endif
        INSTALL = /usr/ucb/install
        TAR = gtar
        endif
        INSTALL = /usr/ucb/install
        TAR = gtar


@@ -903,6 +906,7 @@ ifeq ($(uname_S),AIX)
        else
                PTHREAD_LIBS = -lpthread
        endif
        else
                PTHREAD_LIBS = -lpthread
        endif

+       GIT_TEST_CMP = cmp

 endif
 ifeq ($(uname_S),GNU)
        # GNU/Hurd
 endif
 ifeq ($(uname_S),GNU)
        # GNU/Hurd


@@ -957,6 +961,7 @@ ifeq ($(uname_S),HP-UX)
        NO_HSTRERROR = YesPlease
        NO_SYS_SELECT_H = YesPlease
        SNPRINTF_RETURNS_BOGUS = YesPlease
        NO_HSTRERROR = YesPlease
        NO_SYS_SELECT_H = YesPlease
        SNPRINTF_RETURNS_BOGUS = YesPlease

+       GIT_TEST_CMP = cmp

 endif
 ifeq ($(uname_S),Windows)
        GIT_VERSION := $(GIT_VERSION).MSVC
 endif
 ifeq ($(uname_S),Windows)
        GIT_VERSION := $(GIT_VERSION).MSVC

diff --git a/t/Makefile b/t/Makefile
index 25c559bb49d04586c69242cd7ef03713f0939e9d..172948586578fc57c46053998fad8660d8e9ed21 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -3,6 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
 # Copyright (c) 2005 Junio C Hamano
 #
 

+-include ../config.mak.autogen

 -include ../config.mak
 
 #GIT_TEST_OPTS=--verbose --debug
 -include ../config.mak
 
 #GIT_TEST_OPTS=--verbose --debug