X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhpath%2Ftest-mhpath;h=a9aeee1ac8874d51cb0d6f37e5a458c7ae1396ca;hb=eba408368603a3afe170ef61a334c3a479ea5a29;hp=54a1a125b030e83b59ec7b427753a4bb4d6b4550;hpb=8f75811e49388577186fc634e931edc1834b59c9;p=mmh

diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath
index 54a1a12..a9aeee1 100755
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -27,19 +27,16 @@ Usage: mhpath [+folder] [msgs] [switches]
   -version
   -help
 EOF
-# 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
-  :
-else
-  echo "$0: mhpath -v generated unexpected output" 1>&2
-  failed=`expr ${failed:-0} + 1`
-fi
+case `mhpath -v` in
+  mhpath\ --*) ;;
+  *          ) echo "$0: mhpath -v generated unexpected output" 1>&2
+               failed=`expr ${failed:-0} + 1`;;
+esac
 
 # check +
 run_test "mhpath +" "$MH_TEST_DIR/Mail"