inc/test-eom-align: Fix MMDF-mbox `A' size calculation.

[nmh] / test / mhpath / test-mhpath

diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath
index 84f14e2b08c65945596cd6d5913410524009d91e..e7209ce3865da2e8daa4ddec775bcead06854ea9 100755 (executable)
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -16,6 +16,8 @@ fi
 
 setup_test
 
+check_exit '-eq 1' mhpath -
+
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
@@ -27,20 +29,17 @@ 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, which returns non-zero exit status
-set +e
+#### Skip nmh intro text.
+run_prog mhpath -help | sed '/^$/,$d' >"$actual" 2>&1
+check "$expected" "$actual"
+
+# check -version
 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"
@@ -65,7 +64,7 @@ $MH_TEST_DIR/Mail/inbox/8
 $MH_TEST_DIR/Mail/inbox/9
 $MH_TEST_DIR/Mail/inbox/10
 EOF
-mhpath all > $actual 2>&1
+run_prog mhpath all > $actual 2>&1
 check $expected $actual
 
 # check message number greater than highest
@@ -85,7 +84,7 @@ $MH_TEST_DIR/Mail/inbox/8
 $MH_TEST_DIR/Mail/inbox/9
 $MH_TEST_DIR/Mail/inbox/10
 EOF
-mhpath 1-99999 > $actual 2>&1
+run_prog mhpath 1-99999 > $actual 2>&1
 check $expected $actual
 
 # check new
@@ -97,7 +96,7 @@ $MH_TEST_DIR/Mail/inbox/1
 $MH_TEST_DIR/Mail/inbox/10
 $MH_TEST_DIR/Mail/inbox/11
 EOF
-mhpath first last new > $actual 2>&1
+run_prog mhpath first last new > $actual 2>&1
 check $expected $actual
 
 # check invalid message list using names
@@ -128,15 +127,15 @@ cat > $expected <<EOF
 $MH_TEST_DIR/Mail/inbox/3
 $MH_TEST_DIR/Mail/inbox/4
 EOF
-mhpath first:2 > $actual 2>&1
+run_prog mhpath first:2 > $actual 2>&1
 check $expected $actual
 
-# check reference to non-existant messages
+# check reference to non-existent messages
 cat > $expected <<EOF
 $MH_TEST_DIR/Mail/inbox/1
 $MH_TEST_DIR/Mail/inbox/2
 EOF
-mhpath 1 2 > $actual 2>&1
+run_prog mhpath 1 2 > $actual 2>&1
 check $expected $actual