X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhparam%2Ftest-mhparam;h=a56945ca9ac0bb1af064fa0190a2012a5d247735;hb=374ece2e88368afd6e0a29c4ee4b75ffa9e28b39;hp=f8482774bc941091b6970799d1a3383b458bd20b;hpb=a3bf69c3a988b0de2126fbfe6804c61ef24a8896;p=mmh

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index f848277..a56945c 100755
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -30,20 +30,18 @@ Usage: mhparam [profile-components] [switches]
   -all
   -version
   -help
+  -(debug)
 EOF
-# The exit status is 1 with -help, so temporarily disable -e.
-set +e
+
 mhparam -help >$actual 2>&1
-set -e
 check $expected $actual
 
 # check -version
-if mhparam -v | grep '^mhparam --' >/dev/null; then
-  :
-else
-  echo "$0: mhparam -v generated unexpected output" 1>&2
-  failed=`expr ${failed:-0} + 1`
-fi
+case `mhparam -v` in
+  mhparam\ --*) ;;
+  *           ) echo "$0: mhparam -v generated unexpected output" 1>&2
+                failed=`expr ${failed:-0} + 1`;;
+esac
 
 # check unknown option
 run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
@@ -77,10 +75,11 @@ AliasFile: aliases"
 
 # check each component in procs array in uip/mhparam.c
 # The tests don't override these, so they're default or configured values.
+# Note that cat is hardcoded here because the testsuite uses it for moreproc.
 cat >$expected <<EOF
 context
 .mh_sequences
-$bindir/mhbuild
+$MH_INST_DIR$bindir/mhbuild
 $MH_INST_DIR$bindir/refile
 700
 $bindir/inc
@@ -88,7 +87,7 @@ $auxexecdir/install-mh
 $pagerpath
 $bindir/mhmail
 $MH_INST_DIR$auxexecdir/mhl
-$pagerpath
+cat
 600
 $bindir/msh
 $bindir/packf
@@ -101,7 +100,7 @@ $bindir/msh
 $bindir/whatnow
 $bindir/whom
 $sysconfdir
-$auxexecdir
+${MH_LIB_DIR}
 EOF
 
 mhparam -nocomponent \
@@ -133,15 +132,14 @@ libdir >$actual 2>&1
 check $expected $actual
 
 #### This exits with non-zero status, so let run_test squash that:
-run_test 'mhparam faceproc formatproc rmmproc' ''
-
-#### test sbackup separately because it's only passed as a -D compile option
-if mhparam sbackup | grep ',' >/dev/null; then
-  :
-else
-  echo mhparam sbackup failed
-  failed=`expr ${failed:-0} + 1`
-fi
+run_test 'mhparam formatproc rmmproc' ''
+
+#### Test sbackup separately because it's only passed as a -D compile option.
+case `mhparam sbackup` in
+  ,|\#) ;;
+  *   ) echo mhparam sbackup failed
+        failed=`expr ${failed:-0} + 1` ;;
+esac
 
 # check -component
 run_test 'mhparam -component Path' "Path: $MH_TEST_DIR/Mail"
@@ -164,7 +162,7 @@ mhparam path context nonexistent1 nonexistent2 nonexistent3 >/dev/null
 run_test "echo $?" 3
 set -e
 
-# mhparam -debug (undocumented)
+# mhparam -debug
 # Some of its output depends on configure options, so don't bother to
 # check for correctness here.
 mhparam -debug >/dev/null