mhbuild's fgetstr(): simplify source, logic untouched.

[nmh] / test / mhparam / test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index 89bcb5d22e6e3a050390a5f7bfbeb84fff622234..994619b0e153efc72c2f67f7994844ace2b69616 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -16,6 +16,9 @@ fi
 
 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
@@ -33,8 +36,9 @@ Usage: mhparam [profile-components] [switches]
   -(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
@@ -48,8 +52,9 @@ run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
 
 # check -all
 cp "$MH" $expected
-# -all adds current folder
+# -all adds current folder and Version
 echo 'Current-Folder: '`folder -f` >>$expected
+echo "Version: nmh-$MH_VERSION" >>$expected
 run_prog mhparam -all >$actual
 check $expected $actual 'keep first'
 
@@ -84,22 +89,20 @@ $MH_INST_DIR$bindir/refile
 700
 $bindir/inc
 more
-$bindir/mhmail
-$MH_INST_DIR$auxexecdir/mhl
+$MH_INST_DIR$bindir/mhmail
+$MH_INST_DIR$nmhlibexecdir/mhl
 cat
 600
-$bindir/msh
 $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
-${MH_LIB_DIR}
+$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
@@ -116,18 +119,16 @@ mailproc \
 mhlproc \
 moreproc \
 msgprot \
-mshproc \
 packproc \
 postproc \
 sendproc \
 showmimeproc \
 showproc \
 version \
-vmhproc \
 whatnowproc \
 whomproc \
 etcdir \
-libdir \
+libexecdir \
 datalocking \
 spoollocking >$actual 2>&1