futher test suite fixes to work on Solaris

[mmh] / test / mhparam / test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index 3c94ecc..f848277 100755 (executable)
--- 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
@@ -99,7 +102,6 @@ $bindir/whatnow
 $bindir/whom
 $sysconfdir
 $auxexecdir
-,
 EOF
 
 mhparam -nocomponent \
@@ -126,15 +128,20 @@ 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 ',' >/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"