mhfixmsg now replaces RFC 2047 encoding with RFC 2231 encoding of

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index 91d3b06368f226a2e7512b45d89a7a98ed228152..594d3dbe1287970e3bc83915b59b9922625a09ea 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -44,7 +44,7 @@ HOME=$MH_TEST_DIR
 export HOME
 
 unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE
-unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER
+unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER XOAUTH
 #### Set LC_ALL in individual tests as needed.  Unset these so
 #### that we don't depend on user's settings in other tests.
 unset LANG LC_ALL LC_CTYPE
@@ -225,11 +225,7 @@ check() {
     else
         echo
         #### POSIX diff should support -c.
-#        diff -c "$first" "$second" || true
-        if ! diff -c "$first" "$second"; then
-            echo "$first:"; od -t ax "$first"
-            echo "$second:"; od -t ax "$second"
-        fi
+        diff -c "$first" "$second" || true
         echo
         echo "$0: $label failed, outputs are in $first and $second."
         failed=`expr ${failed:-0} + 1`
@@ -312,13 +308,18 @@ cleanup() {
 
 #### Function to set the test name, and whatever the future brings.
 start_test() {
-    nmh_tests_testname="$1"
+    #### run_test disables exit on non-zero status, but does increment
+    #### failed.  Don't overwrite nmh_tests_testname if there was a
+    #### failure; remember the first test that failed.
+    [ ${failed:-0} -eq 0 ]  &&  nmh_tests_testname="$1"
 }
 
 #### Corresponding function to indicate that the test has finished.  It need
 #### not be called after each test, just the last one in a file.
 finish_test() {
-    unset nmh_tests_testname
+    #### run_test disables exit on non-zero status, but does increment
+    #### failed.  Don't unset nmh_tests_testname if there was a failure.
+    [ ${failed:-0} -eq 0 ]  &&  unset nmh_tests_testname
 }
 
 setup_test ()
@@ -382,6 +383,8 @@ whatnowproc: ${MH_INST_DIR}${bindir}/whatnow
 whomproc: ${MH_INST_DIR}${bindir}/whom
 #: incproc and packproc are defined in config.c but not used by any code.
 EOF
+  #### Suppress warnings about a new version.
+  printf '%s\n' ${MH_VERSION} > ${MH_TEST_DIR}/Mail/VERSION
 
   if test -z '@nmhetcdirinst@'; then
     #### This isn't used with make distcheck, so that we can use it to