implement -prefer, for multipart/alternative preferences

[nmh] / test / mhparam / test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index 0dd8e2b23e25270f4e1d56ef6897d550d935c0c8..8a48b8de264227c587a10258866a9b8cadbbc95a 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -47,7 +47,7 @@ esac
 run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
 
 # check -all
 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
 run_prog mhparam -all >$actual
 # -all adds current folder
 echo 'Current-Folder: '`folder -f` >>$expected
 run_prog mhparam -all >$actual


@@ -69,7 +69,7 @@ check $expected_err $actual_err
 run_test 'mhparam path' "$MH_TEST_DIR/Mail"
 
 # check more than one component, which enables -component
 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"
 
 run_test 'mhparam path AliasFile' "path: $MH_TEST_DIR/Mail
 AliasFile: aliases"
 


@@ -85,21 +85,21 @@ $MH_INST_DIR$bindir/refile
 $bindir/inc
 more
 $bindir/mhmail
 $bindir/inc
 more
 $bindir/mhmail

-$MH_INST_DIR$auxexecdir/mhl
+$MH_INST_DIR$nmhlibexecdir/mhl

 cat
 600
 cat
 600

-$bindir/msh

 $bindir/packf
 $bindir/packf

-$MH_INST_DIR$auxexecdir/post
+$MH_INST_DIR$nmhlibexecdir/post

 $bindir/send
 $bindir/mhshow
 $bindir/send
 $bindir/mhshow

-$MH_INST_DIR$auxexecdir/mhl
+$MH_INST_DIR$nmhlibexecdir/mhl

 nmh-`cat ${srcdir}/VERSION`
 nmh-`cat ${srcdir}/VERSION`

-$bindir/msh

 $bindir/whatnow
 $bindir/whom
 $bindir/whatnow
 $bindir/whom

-$sysconfdir
-${MH_LIB_DIR}
+$nmhetcdirinst
+$MH_LIBEXEC_DIR
+fcntl
+${default_locking}

 EOF
 
 run_prog mhparam -nocomponent \
 EOF
 
 run_prog mhparam -nocomponent \


@@ -114,18 +114,18 @@ mailproc \
 mhlproc \
 moreproc \
 msgprot \
 mhlproc \
 moreproc \
 msgprot \

-mshproc \

 packproc \
 postproc \
 sendproc \
 showmimeproc \
 showproc \
 version \
 packproc \
 postproc \
 sendproc \
 showmimeproc \
 showproc \
 version \

-vmhproc \

 whatnowproc \
 whomproc \
 etcdir \
 whatnowproc \
 whomproc \
 etcdir \

-libdir >$actual 2>&1
+libexecdir \
+datalocking \
+spoollocking >$actual 2>&1

 
 check $expected $actual
 
 
 check $expected $actual
 


@@ -165,4 +165,8 @@ set -e
 # check for correctness here.
 mhparam -debug >/dev/null
 
 # 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
 exit $failed