Use cmp(1) to compare acheieved and expected test results.

'diff -c' on Solaris 11 generate a spurious 'No differences encountered'
message (on stdout, no less!) when the compared files are identical. This
changes the test logic to compare with 'cmp -s', and then perform a
'diff -c' if the results don't match expectations.

diff --git a/test/common.sh.in b/test/common.sh.in
index 3c916274cf5a540ce0f3a55c200e92a12d5a3a3b..4c804155b3145470fba944f052a940fac9f8defe 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -128,10 +128,13 @@ check_for_hard_links () {
 #### If different, global variable "failed" is incremented.
 check() {
     #### POSIX diff should support -c.
 #### If different, global variable "failed" is incremented.
 check() {
     #### POSIX diff should support -c.

-    if diff -c "$1" "$2"; then
+    if cmp -s "$1" "$2"; then

       test $# -lt 3 -o "$3" != 'keep first'  &&  rm -f "$1"
       rm -f "$2"
     else
       test $# -lt 3 -o "$3" != 'keep first'  &&  rm -f "$1"
       rm -f "$2"
     else

+      echo
+      diff -c "$1" "$2"
+      echo

       echo "$0: test failed, outputs are in $1 and $2."
       failed=`expr ${failed:-0} + 1`
     fi
       echo "$0: test failed, outputs are in $1 and $2."
       failed=`expr ${failed:-0} + 1`
     fi