From 8b36fb12c3d6ab1319e05dcfd76cf056a3b6605a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 2 Sep 2011 18:27:55 +0200 Subject: [PATCH] tests: init.sh: Support any non-GNU diff. * tests/init.sh (compare): If "diff -c" is supported but "diff -u" is not, use "diff -c". Useful on AIX 6.1, HP-UX 11.31, OSF/1 5.1, Solaris 8. --- ChangeLog | 9 ++++++++- tests/init.sh | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1c292ab96..b2d7cb1c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,17 @@ 2011-09-02 Bruno Haible + tests: init.sh: Support any non-GNU diff. + * tests/init.sh (compare): If "diff -c" is supported but "diff -u" is + not, use "diff -c". Useful on AIX 6.1, HP-UX 11.31, OSF/1 5.1, + Solaris 8. + +2011-09-02 Bruno Haible + tests: init.sh: work also with any non-GNU diff that supports -u * tests/init.sh: Relax check for diff -u support. Rather than checking for GNU diff via --version, simply check for support for -u itself. Useful at least on OpenBSD 4.9, - AIX 7.1, IRIX 6.5 and Solaris 10. + AIX 7.1, IRIX 6.5, and Solaris 10. 2011-09-01 Bruno Haible diff --git a/tests/init.sh b/tests/init.sh index d3fb28c3f..e6f5f1c42 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -210,6 +210,8 @@ cleanup_ () { :; } if ( diff -u "$0" "$0" < /dev/null ) > /dev/null 2>&1; then compare () { diff -u "$@"; } +elif ( diff -c "$0" "$0" < /dev/null ) > /dev/null 2>&1; then + compare () { diff -c "$@"; } elif ( cmp --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then compare () { cmp -s "$@"; } else -- 2.11.0