# HG changeset patch # User Jim Meyering # Date 1325778184 -3600 # Node ID 57418c6cd32b169fe940780ceee23543ab006700 # Parent df2fa8e181f96a50207de20e8b3b4ebecd764b67 test-init.sh: avoid failure on HP-UX 11.00 * tests/test-init.sh: Skip "diff -u"-comparing step when compare resolves to diff -c or cmp. Reported by Bruno Haible. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-05 Jim Meyering + + test-init.sh: avoid failure on HP-UX 11.00 + * tests/test-init.sh: Skip "diff -u"-comparing step when compare + resolves to diff -c or cmp. Reported by Bruno Haible. + 2012-01-05 Bruno Haible Tests for module 'strtoull'. diff --git a/tests/test-init.sh b/tests/test-init.sh --- a/tests/test-init.sh +++ b/tests/test-init.sh @@ -61,7 +61,11 @@ +xyz EOF sed 's/ .*//;/^@@/d' out > k && mv k out - compare exp out || fail=1 + + # Check the expected output only if compare is using diff -u. + if $(exec 2>/dev/null; diff -u out out < /dev/null); then + compare exp out || fail=1 + fi case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac }