Sigh. Fix up missing conversion from clear->ti_clear.

[nmh] / test / mhpath / test-mhpath

diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath
index 71ee9eaa94b73d35cd7a5f2e04b86b82ad434832..a4b621b787926198e87098e002fccbb72aee3f7f 100755 (executable)
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -27,16 +27,16 @@ Usage: mhpath [+folder] [msgs] [switches]
   -version
   -help
 EOF
   -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
+
+run_prog mhpath -help > $actual 2>&1

 check $expected $actual
 
 # check -version
 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
+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"
 
 # check +
 run_test "mhpath +" "$MH_TEST_DIR/Mail"


@@ -61,7 +61,7 @@ $MH_TEST_DIR/Mail/inbox/8
 $MH_TEST_DIR/Mail/inbox/9
 $MH_TEST_DIR/Mail/inbox/10
 EOF
 $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
 check $expected $actual
 
 # check message number greater than highest


@@ -81,7 +81,7 @@ $MH_TEST_DIR/Mail/inbox/8
 $MH_TEST_DIR/Mail/inbox/9
 $MH_TEST_DIR/Mail/inbox/10
 EOF
 $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
 check $expected $actual
 
 # check new


@@ -93,7 +93,7 @@ $MH_TEST_DIR/Mail/inbox/1
 $MH_TEST_DIR/Mail/inbox/10
 $MH_TEST_DIR/Mail/inbox/11
 EOF
 $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
 check $expected $actual
 
 # check invalid message list using names


@@ -124,7 +124,7 @@ cat > $expected <<EOF
 $MH_TEST_DIR/Mail/inbox/3
 $MH_TEST_DIR/Mail/inbox/4
 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 $expected $actual
 
 # check reference to non-existant messages


@@ -132,7 +132,7 @@ cat > $expected <<EOF
 $MH_TEST_DIR/Mail/inbox/1
 $MH_TEST_DIR/Mail/inbox/2
 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
 
 
 check $expected $actual