init.sh: avoid unwarranted test failure when using "set -x"

* tests/init.sh (compare): Ignore nonzero exit from compare_dev_null_.
Otherwise, in a test script that uses "set -x" (like many in vc-dwim)
a use like "compare exp out" would get evoke an unconditional failure.

diff --git a/ChangeLog b/ChangeLog
index d52e398..fe6ff6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-22  Jim Meyering  <meyering@redhat.com>
+
+       init.sh: avoid unwarranted test failure when using "set -x"
+       * tests/init.sh (compare): Ignore nonzero exit from compare_dev_null_.
+       Otherwise, in a test script that uses "set -x" (like many in vc-dwim)
+       a use like "compare exp out" would get evoke an unconditional failure.
+
 2011-12-21  Alfred M. Szmidt  <ams@gnu.org>
 
        bootstrap: fix it to honor $ACLOCAL_FLAGS once again

diff --git a/tests/init.sh b/tests/init.sh
index 19c0cf4..458a448 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -304,7 +304,7 @@ fi
 # Otherwise, propagate $? to caller: any diffs have already been printed.
 compare ()
 {
-  compare_dev_null_ "$@"
+  compare_dev_null_ "$@" || :
   case $? in
     0|1) return $?;;
     *) compare_ "$@";;