Added exit to test-ali, temporarily, to isolate failure on

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index 390f94f98f8d4753a2c3d7cfe2fcfb28d05b576b..4c804155b3145470fba944f052a940fac9f8defe 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -76,23 +76,35 @@ require_prog ()
 }
 
 # Some stuff for doing silly progress indicators
-progress_update ()
-{
-  THIS="$1"
-  FIRST="$2"
-  LAST="$3"
-  arith_eval $LAST - $FIRST; RANGE=$arith_val
-  arith_eval $THIS - $FIRST; PROG=$arith_val
-  # this automatically rounds to nearest integer
-  arith_eval 100 \* $PROG / $RANGE; PERC=$arith_val
-  # note \r so next update will overwrite
-  printf '%3d%%\r' $PERC
-}
-
-progress_done ()
-{
-  printf '100%%\n'
-}
+if [ -t 1 ] ; then
+  progress_update ()
+  {
+    THIS="$1"
+    FIRST="$2"
+    LAST="$3"
+    arith_eval $LAST - $FIRST; RANGE=$arith_val
+    arith_eval $THIS - $FIRST; PROG=$arith_val
+    # this automatically rounds to nearest integer
+    arith_eval 100 \* $PROG / $RANGE; PERC=$arith_val
+    # note \r so next update will overwrite
+    printf '%3d%%\r' $PERC
+  }
+  
+  progress_done ()
+  {
+    printf '100%%\n'
+  }
+else
+  # don't emit anything if stdout is not connected to a tty.
+  progress_update ()
+  {
+       :
+  }
+  progress_done ()
+  {
+       :
+  }
+fi
 
 check_for_hard_links () {
   set +e
@@ -116,10 +128,13 @@ check_for_hard_links () {
 #### 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
+      echo
+      diff -c "$1" "$2"
+      echo
       echo "$0: test failed, outputs are in $1 and $2."
       failed=`expr ${failed:-0} + 1`
     fi