X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhparam%2Ftest-mhparam;h=7c9bba23af33413f693907bdde47fcdd9cce695e;hb=7821f54f1884b7def6789830d80b364a2dbaea6d;hp=cdaab59870a71fd6de7e145ad91c344be5d8cb8c;hpb=826c614b7f2dd80cec7d1bd754e2aedbcf346555;p=mmh

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index cdaab59..7c9bba2 100755
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -31,16 +31,17 @@ Usage: mhparam [profile-components] [switches]
   -version
   -help
 EOF
-# The exit status is 1 with -help, so invert it to prevent
-# triggering immediate exit due to set -e.
-! mhparam -help >$actual 2>&1
+
+# check -help
+mhparam -help >$actual 2>&1
 check $expected $actual
 
 # check -version
-if ! mhparam -v | grep '^mhparam --' >/dev/null; then
-  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'
@@ -74,6 +75,7 @@ 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
@@ -85,7 +87,7 @@ $auxexecdir/install-mh
 $pagerpath
 $bindir/mhmail
 $MH_INST_DIR$auxexecdir/mhl
-$pagerpath
+cat
 600
 $bindir/msh
 $bindir/packf
@@ -132,12 +134,12 @@ 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 -F ',
-#' >/dev/null; then
-  echo mhparam sbackup failed
-  failed=`expr ${failed:-0} + 1`
-fi
+#### 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"