Don't `else' after return. Simplify control flow.

[nmh] / test / mhparam / test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index b29cba15934007d42e12b5673fda00231d9d8cec..83b8407ead082c7d2c66ea16f2b6a2a6bb00618d 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -34,13 +34,7 @@ Usage: mhparam [profile-components] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### 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
+mhparam -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version


@@ -55,8 +49,9 @@ run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
 
 # check -all
 cp "$MH" $expected
 
 # check -all
 cp "$MH" $expected

-# -all adds current folder
+# -all adds current folder and Version

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

+echo "Version: nmh-$MH_VERSION" >>$expected

 run_prog mhparam -all >$actual
 check $expected $actual 'keep first'
 
 run_prog mhparam -all >$actual
 check $expected $actual 'keep first'
 


@@ -100,7 +95,7 @@ $MH_INST_DIR$nmhlibexecdir/post
 $MH_INST_DIR$bindir/send
 $MH_INST_DIR$bindir/mhshow
 $MH_INST_DIR$nmhlibexecdir/mhl
 $MH_INST_DIR$bindir/send
 $MH_INST_DIR$bindir/mhshow
 $MH_INST_DIR$nmhlibexecdir/mhl

-nmh-`cat ${srcdir}/VERSION`
+nmh-$MH_VERSION

 $MH_INST_DIR$bindir/whatnow
 $MH_INST_DIR$bindir/whom
 $nmhetcdirinst
 $MH_INST_DIR$bindir/whatnow
 $MH_INST_DIR$bindir/whom
 $nmhetcdirinst