X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/28c3595a77a8c942bee1057085776dad0b3d53f4..adcc6d9d4fd9128d36fab0ef0862604b90693e63:/test/mhparam/test-mhparam?ds=sidebyside diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam index 89bcb5d2..b29cba15 100755 --- a/test/mhparam/test-mhparam +++ b/test/mhparam/test-mhparam @@ -33,8 +33,15 @@ Usage: mhparam [profile-components] [switches] -(debug) EOF -mhparam -help >$actual 2>&1 -check $expected $actual +#### Skip nmh intro text. +# ???? debug +set +e +mhparam -help +echo now through sed: +mhparam -help | sed '/^$/Q' +# ???? debug +mhparam -help | sed '/^$/Q' >"$actual" 2>&1 +check "$expected" "$actual" # check -version case `mhparam -v` in @@ -84,22 +91,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 +$MH_INST_DIR$nmhlibexecdir/post +$MH_INST_DIR$bindir/send +$MH_INST_DIR$bindir/mhshow +$MH_INST_DIR$nmhlibexecdir/mhl nmh-`cat ${srcdir}/VERSION` -$bindir/msh -$bindir/whatnow -$bindir/whom -$sysconfdir -${MH_LIB_DIR} +$MH_INST_DIR$bindir/whatnow +$MH_INST_DIR$bindir/whom +$nmhetcdirinst +$MH_LIBEXEC_DIR fcntl ${default_locking} EOF @@ -116,18 +121,16 @@ mailproc \ mhlproc \ moreproc \ msgprot \ -mshproc \ packproc \ postproc \ sendproc \ showmimeproc \ showproc \ version \ -vmhproc \ whatnowproc \ whomproc \ etcdir \ -libdir \ +libexecdir \ datalocking \ spoollocking >$actual 2>&1