X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8f75811e49388577186fc634e931edc1834b59c9..2d0ec821c490569161509bd109aadee00d328cb0:/test/mhparam/test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index 08aff2c8..bdab7155 100755
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -31,19 +31,17 @@ Usage: mhparam [profile-components] [switches]
   -version
   -help
 EOF
-# The exit status is 1 with -help, so temporarily disable -e.
-set +e
+
+# check -help
 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'
@@ -135,14 +133,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
-  :
-else
-  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"