X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c26c2e8330a242ee20ed1538e9b371198aabd215..802a19d93d6b0c9fb1b4ff5a071f4b41c486ea19:/test/mhparam/test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index 573020e3..c3157782 100755
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -30,41 +30,38 @@ Usage: mhparam [profile-components] [switches]
   -all
   -version
   -help
+  -(debug)
 EOF
-# The exit status is 1 with -help, so temporarily disable -e.
-set +e
+
 mhparam -help >$actual 2>&1
-set -e
 check $expected $actual
 
-# check -version, which returns non-zero exit status
-set +e
+# check -version
 case `mhparam -v` in
   mhparam\ --*) ;;
   *           ) echo "$0: mhparam -v generated unexpected output" 1>&2
                 failed=`expr ${failed:-0} + 1`;;
 esac
-set -e
 
 # check unknown option
 run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
 
 # check -all
-cp $MH_TEST_DIR/Mail/.mh_profile $expected
+cp "$MH" $expected
 # -all adds current folder
 echo 'Current-Folder: '`folder -f` >>$expected
-mhparam -all >$actual
+run_prog mhparam -all >$actual
 check $expected $actual 'keep first'
 
 # check -all with a component
 echo 'mhparam: profile-components ignored with -all' >$expected_err
-mhparam -all path >$actual 2>$actual_err
+run_prog mhparam -all path >$actual 2>$actual_err
 check $expected $actual 'keep first'
 check $expected_err $actual_err
 
 # check -all with -components
 echo 'mhparam: -components ignored with -all' >$expected_err
-mhparam -all -components >$actual 2>$actual_err
+run_prog mhparam -all -components >$actual 2>$actual_err
 check $expected $actual
 check $expected_err $actual_err
 
@@ -72,69 +69,68 @@ check $expected_err $actual_err
 run_test 'mhparam path' "$MH_TEST_DIR/Mail"
 
 # check more than one component, which enables -component
-echo 'AliasFile: aliases' >>"$MH_TEST_DIR/Mail/.mh_profile"
+echo 'AliasFile: aliases' >>"$MH"
 run_test 'mhparam path AliasFile' "path: $MH_TEST_DIR/Mail
 AliasFile: aliases"
 
 # check each component in procs array in uip/mhparam.c
 # The tests don't override these, so they're default or configured values.
+# Note that cat is hardcoded here because the testsuite uses it for moreproc.
 cat >$expected <<EOF
 context
 .mh_sequences
-$bindir/mhbuild
+$MH_INST_DIR$bindir/mhbuild
 $MH_INST_DIR$bindir/refile
 700
 $bindir/inc
-$auxexecdir/install-mh
-$pagerpath
+more
 $bindir/mhmail
-$MH_INST_DIR$auxexecdir/mhl
-$pagerpath
+$MH_INST_DIR$nmhexecdir/mhl
+cat
 600
-$bindir/msh
 $bindir/packf
-$MH_INST_DIR$auxexecdir/post
+$MH_INST_DIR$nmhexecdir/post
 $bindir/send
 $bindir/mhshow
-$MH_INST_DIR$auxexecdir/mhl
+$MH_INST_DIR$nmhexecdir/mhl
 nmh-`cat ${srcdir}/VERSION`
-$bindir/msh
 $bindir/whatnow
 $bindir/whom
-$sysconfdir
-$auxexecdir
+$nmhetcdir
+$MH_LIBEXEC_DIR
+fcntl
+${default_locking}
 EOF
 
-mhparam -nocomponent \
+run_prog mhparam -nocomponent \
 context \
 mh-sequences \
 buildmimeproc \
 fileproc \
 foldprot \
 incproc \
-installproc \
 lproc \
 mailproc \
 mhlproc \
 moreproc \
 msgprot \
-mshproc \
 packproc \
 postproc \
 sendproc \
 showmimeproc \
 showproc \
 version \
-vmhproc \
 whatnowproc \
 whomproc \
 etcdir \
-libdir >$actual 2>&1
+libexecdir \
+datalocking \
+spoollocking >$actual 2>&1
 
 check $expected $actual
 
 #### This exits with non-zero status, so let run_test squash that:
-run_test 'mhparam faceproc formatproc rmmproc' ''
+run_test 'mhparam formatproc rmmproc' ''
 
 #### Test sbackup separately because it's only passed as a -D compile option.
 case `mhparam sbackup` in
@@ -164,9 +160,13 @@ mhparam path context nonexistent1 nonexistent2 nonexistent3 >/dev/null
 run_test "echo $?" 3
 set -e
 
-# mhparam -debug (undocumented)
+# mhparam -debug
 # Some of its output depends on configure options, so don't bother to
 # check for correctness here.
 mhparam -debug >/dev/null
 
+# check with text file that does not end with newline
+printf 'Editor: emacs' >>"$MH"
+run_test 'mhparam -nocomponent editor' 'emacs'
+
 exit $failed