X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhparam%2Ftest-mhparam;h=08aff2c8447f6adf83f9997e38de32079cb210c5;hb=8f75811e49388577186fc634e931edc1834b59c9;hp=cc62a24ba731d1eb435196f0a844ac474c1ec7ce;hpb=dbca0b05827f4c04050b29c6f8a89051a150aa0f;p=mmh

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index cc62a24..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
@@ -93,13 +96,12 @@ $MH_INST_DIR$auxexecdir/post
 $bindir/send
 $bindir/mhshow
 $MH_INST_DIR$auxexecdir/mhl
-nmh-`cat $MH_OBJ_DIR/VERSION`
+nmh-`cat ${srcdir}/VERSION`
 $bindir/msh
 $bindir/whatnow
 $bindir/whom
 $sysconfdir
 $auxexecdir
-,
 EOF
 
 mhparam -nocomponent \
@@ -126,15 +128,21 @@ vmhproc \
 whatnowproc \
 whomproc \
 etcdir \
-libdir \
-sbackup >$actual 2>&1
+libdir >$actual 2>&1
 
 check $expected $actual
 
-#### These return status of 1, so let run_test squash that:
-run_test 'mhparam -nocomponent faceproc' ''
-run_test 'mhparam -nocomponent formatproc' ''
-run_test 'mhparam -nocomponent rmmproc' ''
+#### 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
 
 # check -component
 run_test 'mhparam -component Path' "Path: $MH_TEST_DIR/Mail"