X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhparam%2Ftest-mhparam;h=08aff2c8447f6adf83f9997e38de32079cb210c5;hb=8f75811e49388577186fc634e931edc1834b59c9;hp=cdaab59870a71fd6de7e145ad91c344be5d8cb8c;hpb=826c614b7f2dd80cec7d1bd754e2aedbcf346555;p=mmh diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam index cdaab59..08aff2c 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,10 @@ 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 ', +if mhparam sbackup | grep -F ', #' >/dev/null; then + : +else echo mhparam sbackup failed failed=`expr ${failed:-0} + 1` fi