Put in check so "attach" is rejected when the draft already has MIME headers.

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index d425dbb72afa5dfc0583467c9aa8c3ee1765fcc0..67b18a8239d6bce3629b860585b376dab1e80c6c 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -14,6 +14,7 @@ test -z "$bindir"  &&  bindir="@bindir@"
 test -z "$mandir"  &&  mandir="@mandir@"
 test -z "$sysconfdir"  &&  sysconfdir="@sysconfdir@"
 test -z "$supported_locks"  &&  supported_locks="@supported_locks@"
+test -z "$default_locking"  &&  default_locking="@default_locking@"
 test -z "$MULTIBYTE_ENABLED"  &&  MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@"
 test -z "$ICONV_ENABLED"  &&  ICONV_ENABLED="@ICONV_ENABLED@"
 export MH_TEST_DIR auxexecdir bindir mandir sysconfdir
@@ -23,7 +24,10 @@ test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
 export MH_INST_DIR
 
 unset MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE
-unset MHLDEBUG MHPDEBUG MHWDEBUG MM_CHARSET PAGER
+unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER
+#### 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_TYPE
 
 #### Use a test dir for tmp files when MHTMPDIR applies.
 MHTMPDIR=$MH_TEST_DIR/Mail
@@ -189,8 +193,9 @@ check() {
 #### Shortcut to enable use of valgrind:  set NMH_VALGRIND environment
 #### variable (to anything) so run_* will use valgrind.
 if [ "${NMH_VALGRIND}"  -a  -z "${NMH_TEST_PREFIX}" ]; then
+  #### Need absolute path to valgrind.supp in case the test does a cd.
   NMH_TEST_PREFIX="valgrind --quiet --error-exitcode=1 \
-                            --suppressions=$MH_OBJ_DIR/test/valgrind.supp"
+                     --suppressions=`cd ${srcdir} && pwd`/test/valgrind.supp"
 fi
 
 #### Run test under another program by setting NMH_TEST_PREFIX
@@ -261,7 +266,7 @@ setup_test ()
   export PATH
 
   # clean old test data
-  trap "rm -rf '$MH_TEST_DIR/Mail'" 0
+  trap "cd $MH_TEST_DIR; rm -rf '$MH_TEST_DIR/Mail'" 0
   # setup test data
   mkdir -p "$MH_TEST_DIR/Mail" || exit 1
   cat > "$MH" <<EOF || exit 1
@@ -279,8 +284,8 @@ EOF
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \
            mhl.digest mhl.format mhl.forward mhl.headers mhl.reply \
            mhn.defaults rcvdistcomps replcomps replgroupcomps scan.MMDDYY \
-           scan.YYYYMMDD scan.default scan.highlighted scan.mailx scan.nomime \
-           scan.size scan.time scan.timely scan.unseen
+           scan.YYYYMMDD scan.curses scan.default scan.highlighted scan.mailx \
+          scan.nomime scan.size scan.time scan.timely scan.unseen
   do
     cp "${MH_INST_DIR}${sysconfdir}/${f}" "${MH_TEST_DIR}/Mail" || exit 1
   done