A bad cut-and-paste job made -noinlineonly not work. Patch from

[nmh] / test / mhparam / test-mhparam

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index cc6089ed79b8e19fa40fd9b9d4bb33c0d1ce503f..89bcb5d22e6e3a050390a5f7bfbeb84fff622234 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -47,21 +47,21 @@ esac
 run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
 
 # check -all
 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
 


@@ -69,7 +69,7 @@ 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"
 
 run_test 'mhparam path AliasFile' "path: $MH_TEST_DIR/Mail
 AliasFile: aliases"
 


@@ -79,12 +79,11 @@ AliasFile: aliases"
 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
+more

 $bindir/mhmail
 $MH_INST_DIR$auxexecdir/mhl
 cat
 $bindir/mhmail
 $MH_INST_DIR$auxexecdir/mhl
 cat


@@ -100,17 +99,18 @@ $bindir/msh
 $bindir/whatnow
 $bindir/whom
 $sysconfdir
 $bindir/whatnow
 $bindir/whom
 $sysconfdir

-$auxexecdir
+${MH_LIB_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 \
 lproc \
 mailproc \
 mhlproc \


@@ -127,7 +127,9 @@ vmhproc \
 whatnowproc \
 whomproc \
 etcdir \
 whatnowproc \
 whomproc \
 etcdir \

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

 
 check $expected $actual
 
 
 check $expected $actual
 


@@ -167,4 +169,8 @@ set -e
 # check for correctness here.
 mhparam -debug >/dev/null
 
 # 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