Merge remote-tracking branch 'origin/convertargs'

[nmh] / test / mhparam / test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index cc62a24ba731d1eb435196f0a844ac474c1ec7ce..29dd11f3a4a15b8ec8401820b410d694133f5b82 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -30,37 +30,38 @@ Usage: mhparam [profile-components] [switches]
   -all
   -version
   -help
   -all
   -version
   -help

+  -(debug)

 EOF
 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
+
+mhparam -help >$actual 2>&1

 check $expected $actual
 
 # check -version
 check $expected $actual
 
 # check -version

-if ! mhparam -v | grep '^mhparam --' >/dev/null; then
-  echo "$0: mhparam -v generated unexpected output" 1>&2
-  failed=`expr ${failed:-0} + 1`
-fi
+case `mhparam -v` in
+  mhparam\ --*) ;;
+  *           ) echo "$0: mhparam -v generated unexpected output" 1>&2
+                failed=`expr ${failed:-0} + 1`;;
+esac

 
 # check unknown option
 run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
 
 # check -all
 
 # check unknown option
 run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
 
 # check -all

-cp $MH_TEST_DIR/Mail/.mh_profile $expected
+cp "$MH" $expected

 # -all adds current folder
 echo 'Current-Folder: '`folder -f` >>$expected
 # -all adds current folder
 echo 'Current-Folder: '`folder -f` >>$expected

-mhparam -all >$actual
+run_prog mhparam -all >$actual

 check $expected $actual 'keep first'
 
 # check -all with a component
 echo 'mhparam: profile-components ignored with -all' >$expected_err
 check $expected $actual 'keep first'
 
 # check -all with a component
 echo 'mhparam: profile-components ignored with -all' >$expected_err

-mhparam -all path >$actual 2>$actual_err
+run_prog mhparam -all path >$actual 2>$actual_err

 check $expected $actual 'keep first'
 check $expected_err $actual_err
 
 # check -all with -components
 echo 'mhparam: -components ignored with -all' >$expected_err
 check $expected $actual 'keep first'
 check $expected_err $actual_err
 
 # check -all with -components
 echo 'mhparam: -components ignored with -all' >$expected_err

-mhparam -all -components >$actual 2>$actual_err
+run_prog mhparam -all -components >$actual 2>$actual_err

 check $expected $actual
 check $expected_err $actual_err
 
 check $expected $actual
 check $expected_err $actual_err
 


@@ -68,73 +69,75 @@ check $expected_err $actual_err
 run_test 'mhparam path' "$MH_TEST_DIR/Mail"
 
 # check more than one component, which enables -component
 run_test 'mhparam path' "$MH_TEST_DIR/Mail"
 
 # check more than one component, which enables -component

-echo 'AliasFile: aliases' >>"$MH_TEST_DIR/Mail/.mh_profile"
+echo 'AliasFile: aliases' >>"$MH"

 run_test 'mhparam path AliasFile' "path: $MH_TEST_DIR/Mail
 AliasFile: aliases"
 
 # check each component in procs array in uip/mhparam.c
 # The tests don't override these, so they're default or configured values.
 run_test 'mhparam path AliasFile' "path: $MH_TEST_DIR/Mail
 AliasFile: aliases"
 
 # check each component in procs array in uip/mhparam.c
 # The tests don't override these, so they're default or configured values.

+# Note that cat is hardcoded here because the testsuite uses it for moreproc.

 cat >$expected <<EOF
 context
 .mh_sequences
 cat >$expected <<EOF
 context
 .mh_sequences

-$bindir/mhbuild
+$MH_INST_DIR$bindir/mhbuild

 $MH_INST_DIR$bindir/refile
 700
 $bindir/inc
 $MH_INST_DIR$bindir/refile
 700
 $bindir/inc

-$auxexecdir/install-mh
-$pagerpath
-$bindir/mhmail
-$MH_INST_DIR$auxexecdir/mhl
-$pagerpath
+more
+$MH_INST_DIR$bindir/mhmail
+$MH_INST_DIR$nmhlibexecdir/mhl
+cat

 600
 600

-$bindir/msh

 $bindir/packf
 $bindir/packf

-$MH_INST_DIR$auxexecdir/post
-$bindir/send
-$bindir/mhshow
-$MH_INST_DIR$auxexecdir/mhl
-nmh-`cat $MH_OBJ_DIR/VERSION`
-$bindir/msh
-$bindir/whatnow
-$bindir/whom
-$sysconfdir
-$auxexecdir
-,
+$MH_INST_DIR$nmhlibexecdir/post
+$MH_INST_DIR$bindir/send
+$MH_INST_DIR$bindir/mhshow
+$MH_INST_DIR$nmhlibexecdir/mhl
+nmh-`cat ${srcdir}/VERSION`
+$MH_INST_DIR$bindir/whatnow
+$MH_INST_DIR$bindir/whom
+$nmhetcdirinst
+$MH_LIBEXEC_DIR
+fcntl
+${default_locking}

 EOF
 
 EOF
 

-mhparam -nocomponent \
+run_prog mhparam -nocomponent \

 context \
 mh-sequences \
 buildmimeproc \
 fileproc \
 foldprot \
 incproc \
 context \
 mh-sequences \
 buildmimeproc \
 fileproc \
 foldprot \
 incproc \

-installproc \

 lproc \
 mailproc \
 mhlproc \
 moreproc \
 msgprot \
 lproc \
 mailproc \
 mhlproc \
 moreproc \
 msgprot \

-mshproc \

 packproc \
 postproc \
 sendproc \
 showmimeproc \
 showproc \
 version \
 packproc \
 postproc \
 sendproc \
 showmimeproc \
 showproc \
 version \

-vmhproc \

 whatnowproc \
 whomproc \
 etcdir \
 whatnowproc \
 whomproc \
 etcdir \

-libdir \
-sbackup >$actual 2>&1
+libexecdir \
+datalocking \
+spoollocking >$actual 2>&1

 
 check $expected $actual
 
 
 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 formatproc rmmproc' ''
+
+#### Test sbackup separately because it's only passed as a -D compile option.
+case `mhparam sbackup` in
+  ,|\#) ;;
+  *   ) echo mhparam sbackup failed
+        failed=`expr ${failed:-0} + 1` ;;
+esac

 
 # check -component
 run_test 'mhparam -component Path' "Path: $MH_TEST_DIR/Mail"
 
 # check -component
 run_test 'mhparam -component Path' "Path: $MH_TEST_DIR/Mail"


@@ -157,9 +160,13 @@ mhparam path context nonexistent1 nonexistent2 nonexistent3 >/dev/null
 run_test "echo $?" 3
 set -e
 
 run_test "echo $?" 3
 set -e
 

-# mhparam -debug (undocumented)
+# mhparam -debug

 # Some of its output depends on configure options, so don't bother to
 # check for correctness here.
 mhparam -debug >/dev/null
 
 # Some of its output depends on configure options, so don't bother to
 # check for correctness here.
 mhparam -debug >/dev/null
 

+# check with text file that does not end with newline
+printf 'Editor: emacs' >>"$MH"
+run_test 'mhparam -nocomponent editor' 'emacs'
+

 exit $failed
 exit $failed