X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/826c614b7f2dd80cec7d1bd754e2aedbcf346555..0c6388f924d3df6facabbb7c0130b4c856f4b20f:/test/mhparam/test-mhparam diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam index cdaab598..f8482774 100755 --- a/test/mhparam/test-mhparam +++ b/test/mhparam/test-mhparam @@ -31,13 +31,16 @@ 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 +# 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 +if mhparam -v | grep '^mhparam --' >/dev/null; then + : +else echo "$0: mhparam -v generated unexpected output" 1>&2 failed=`expr ${failed:-0} + 1` fi @@ -133,8 +136,9 @@ check $expected $actual 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 +if mhparam sbackup | grep ',' >/dev/null; then + : +else echo mhparam sbackup failed failed=`expr ${failed:-0} + 1` fi