Mercurial > hg > octave-lojdl > gnulib-hg
changeset 15560:56405c4de542
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.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 02 Sep 2011 18:27:55 +0200 |
| parents | 045f9cdabfe3 |
| children | 687a4f77c0f3 |
| files | ChangeLog tests/init.sh |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,17 @@ +2011-09-02 Bruno Haible <bruno@clisp.org> + + 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 <bruno@clisp.org> 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 <bruno@clisp.org>
--- a/tests/init.sh +++ b/tests/init.sh @@ -210,6 +210,8 @@ 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