Remove unused NCWD and NPWD #defines.

[nmh] / test / mhparam / test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index 8a48b8de264227c587a10258866a9b8cadbbc95a..83b8407ead082c7d2c66ea16f2b6a2a6bb00618d 100755 (executable)
--- 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
@@ -48,8 +49,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,18 +86,18 @@ $MH_INST_DIR$bindir/refile
 700
 $bindir/inc
 more
-$bindir/mhmail
+$MH_INST_DIR$bindir/mhmail
 $MH_INST_DIR$nmhlibexecdir/mhl
 cat
 600
 $bindir/packf
 $MH_INST_DIR$nmhlibexecdir/post
-$bindir/send
-$bindir/mhshow
+$MH_INST_DIR$bindir/send
+$MH_INST_DIR$bindir/mhshow
 $MH_INST_DIR$nmhlibexecdir/mhl
-nmh-`cat ${srcdir}/VERSION`
-$bindir/whatnow
-$bindir/whom
+nmh-$MH_VERSION
+$MH_INST_DIR$bindir/whatnow
+$MH_INST_DIR$bindir/whom
 $nmhetcdirinst
 $MH_LIBEXEC_DIR
 fcntl