Removed set +e where not needed in test-mhfixmsg.

[nmh] / test / mhfixmsg / test-mhfixmsg

diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index 317d02b28000c36210f1961684e4b7fac2830d44..9df3f657455d3a810f256c89b6fe1eba8b4576be 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -22,7 +22,6 @@ actual_err="$MH_TEST_DIR/test-mhfixmsg$$.actual_err"
 #### Make sure that html-to-text conversion is what we expect.
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 #### Make sure that html-to-text conversion is what we expect.
 LC_ALL=en_US.UTF-8; export LC_ALL
 

-set +e

 if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \
   >/dev/null; then
   can_reformat_texthtml=1
 if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \
   >/dev/null; then
   can_reformat_texthtml=1


@@ -33,15 +32,12 @@ if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \
     #### relics from this test if it is writeable but doesn't already
     #### have a .w3m, and to not depend on whatever is in that if it
     #### does already exist, overwrite $HOME if using w3m.
     #### relics from this test if it is writeable but doesn't already
     #### have a .w3m, and to not depend on whatever is in that if it
     #### does already exist, overwrite $HOME if using w3m.

-    HOME="$MHTMPDIR"
-    export HOME
+    HOME="$MHTMPDIR"; export HOME

   fi
 else
   fi
 else

-  echo "$0: skipping -reformat check because \
-    mhfixmsg-format-text/html is not available"
+  echo "$0: skipping -reformat check because no text browser was found"

   can_reformat_texthtml=0
 fi
   can_reformat_texthtml=0
 fi

-set -e

 
 
 # check -help
 
 
 # check -help


@@ -580,9 +576,7 @@ Db2yPbwK
 EOF
 
 cp -p `mhpath last` "$expected"
 EOF
 
 cp -p `mhpath last` "$expected"

-set +e

 run_prog mhfixmsg last
 run_prog mhfixmsg last

-set -e

 check `mhpath last` "$expected" 'keep first'
 
 
 check `mhpath last` "$expected" 'keep first'