mh-mkstemp.man: Detail exit status as 255 rather than -1.

[nmh] / test / mhparam / test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index cc6089ed79b8e19fa40fd9b9d4bb33c0d1ce503f..994619b0e153efc72c2f67f7994844ace2b69616 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -16,6 +16,9 @@ fi
 
 setup_test
 
 
 setup_test
 

+check_exit '-eq 1' mhparam - # gcov
+check_exit '-eq 0' mhparam localmbox # gcov
+

 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual


@@ -33,8 +36,9 @@ Usage: mhparam [profile-components] [switches]
   -(debug)
 EOF
 
   -(debug)
 EOF
 

-mhparam -help >$actual 2>&1
-check $expected $actual
+#### Skip nmh intro text.
+mhparam -help | sed '/^$/,$d' >"$actual" 2>&1
+check "$expected" "$actual"

 
 # check -version
 case `mhparam -v` in
 
 # check -version
 case `mhparam -v` in


@@ -47,21 +51,22 @@ 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
-# -all adds current folder
+cp "$MH" $expected
+# -all adds current folder and Version

 echo 'Current-Folder: '`folder -f` >>$expected
 echo 'Current-Folder: '`folder -f` >>$expected

-mhparam -all >$actual
+echo "Version: nmh-$MH_VERSION" >>$expected
+run_prog mhparam -all >$actual

 check $expected $actual 'keep first'
 
 # check -all with a component
 echo 'mhparam: profile-components ignored with -all' >$expected_err
 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
 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
 
 check $expected $actual
 check $expected_err $actual_err
 


@@ -69,7 +74,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"
 


@@ -79,55 +84,53 @@ AliasFile: aliases"
 cat >$expected <<EOF
 context
 .mh_sequences
 cat >$expected <<EOF
 context
 .mh_sequences

-$bindir/mhbuild
+$MH_INST_DIR$bindir/mhbuild

 $MH_INST_DIR$bindir/refile
 700
 $bindir/inc
 $MH_INST_DIR$bindir/refile
 700
 $bindir/inc

-$auxexecdir/install-mh
-$pagerpath
-$bindir/mhmail
-$MH_INST_DIR$auxexecdir/mhl
+more
+$MH_INST_DIR$bindir/mhmail
+$MH_INST_DIR$nmhlibexecdir/mhl

 cat
 600
 cat
 600

-$bindir/msh

 $bindir/packf
 $bindir/packf

-$MH_INST_DIR$auxexecdir/post
-$bindir/send
-$bindir/mhshow
-$MH_INST_DIR$auxexecdir/mhl
-nmh-`cat ${srcdir}/VERSION`
-$bindir/msh
-$bindir/whatnow
-$bindir/whom
-$sysconfdir
-$auxexecdir
+$MH_INST_DIR$nmhlibexecdir/post
+$MH_INST_DIR$bindir/send
+$MH_INST_DIR$bindir/mhshow
+$MH_INST_DIR$nmhlibexecdir/mhl
+nmh-$MH_VERSION
+$MH_INST_DIR$bindir/whatnow
+$MH_INST_DIR$bindir/whom
+$nmhetcdirinst
+$MH_LIBEXEC_DIR
+fcntl
+${default_locking}

 EOF
 
 EOF
 

-mhparam -nocomponent \
+run_prog mhparam -nocomponent \

 context \
 mh-sequences \
 buildmimeproc \
 fileproc \
 foldprot \
 incproc \
 context \
 mh-sequences \
 buildmimeproc \
 fileproc \
 foldprot \
 incproc \

-installproc \

 lproc \
 mailproc \
 mhlproc \
 moreproc \
 msgprot \
 lproc \
 mailproc \
 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
 


@@ -167,4 +170,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