X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4d6cfbb1c9b425cb693e5189a19e132c67f5494a..5ccbd49adba7e6d48f4094fa6eade7a7fb8ec4cf:/test/mhpath/test-mhpath

diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath
index 71ee9eaa..84f14e2b 100755
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -27,16 +27,20 @@ Usage: mhpath [+folder] [msgs] [switches]
   -version
   -help
 EOF
-# The exit status is 1 with -help, so invert it to prevent
-# triggering immediate exit due to set -e.
-! mhpath -help > $actual 2>&1
+# The exit status is 1 with -help, so temporarily disable -e.
+set +e
+mhpath -help > $actual 2>&1
+set -e
 check $expected $actual
 
-# check -version
-if ! mhpath -v | grep '^mhpath --' > /dev/null; then
-  echo "$0: mhpath -v generated unexpected output" 1>&2
-  failed=`expr ${failed:-0} + 1`
-fi
+# check -version, which returns non-zero exit status
+set +e
+case `mhpath -v` in
+  mhpath\ --*) ;;
+  *          ) echo "$0: mhpath -v generated unexpected output" 1>&2
+               failed=`expr ${failed:-0} + 1`;;
+esac
+set -e
 
 # check +
 run_test "mhpath +" "$MH_TEST_DIR/Mail"