X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e857ecade62ec99c49386cf4f670c18f4be232b..2e9c6b8b2c97bafa9416690d562a9425c5bd238f:/test/mhparam/test-mhparam diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam index 89bcb5d2..a7e76bf2 100755 --- a/test/mhparam/test-mhparam +++ b/test/mhparam/test-mhparam @@ -33,8 +33,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 @@ -84,22 +85,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 +115,16 @@ mailproc \ mhlproc \ moreproc \ msgprot \ -mshproc \ packproc \ postproc \ sendproc \ showmimeproc \ showproc \ version \ -vmhproc \ whatnowproc \ whomproc \ etcdir \ -libdir \ +libexecdir \ datalocking \ spoollocking >$actual 2>&1