From dbca0b05827f4c04050b29c6f8a89051a150aa0f Mon Sep 17 00:00:00 2001 From: David Levine Date: Fri, 6 Apr 2012 12:27:22 -0500 Subject: [PATCH] Reworked mhparam tests of components in procs array to depend on values set in common.sh, notably $pagerpath. --- test/common.sh.in | 3 +- test/mhparam/test-mhparam | 84 +++++++++++++++++++++++++++++++-------------- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/test/common.sh.in b/test/common.sh.in index 1162566..7c38d7d 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -13,7 +13,8 @@ test -z "$auxexecdir" && auxexecdir="@libdir@" test -z "$bindir" && bindir="@bindir@" test -z "$mandir" && mandir="@mandir@" test -z "$sysconfdir" && sysconfdir="@sysconfdir@" -export MH_TEST_DIR auxexecdir bindir mandir sysconfdir +test -z "$pagerpath" && pagerpath="@pagerpath@" +export MH_TEST_DIR auxexecdir bindir mandir sysconfdir pagerpath test -z "$MH_INST_DIR" && MH_INST_DIR=${MH_TEST_DIR}/inst export MH_INST_DIR diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam index 629a3f2..cc62a24 100755 --- a/test/mhparam/test-mhparam +++ b/test/mhparam/test-mhparam @@ -73,34 +73,68 @@ run_test 'mhparam path AliasFile' "path: $MH_TEST_DIR/Mail AliasFile: aliases" # check each component in procs array in uip/mhparam.c -run_test 'mhparam -nocomponent context' 'context' -run_test 'mhparam -nocomponent mh-sequences' '.mh_sequences' -run_test 'mhparam -nocomponent buildmimeproc' "$prefix/bin/mhbuild" +# The tests don't override these, so they're default or configured values. +cat >$expected <$actual 2>&1 + +check $expected $actual + +#### These return status of 1, so let run_test squash that: run_test 'mhparam -nocomponent faceproc' '' -run_test 'mhparam -nocomponent fileproc' "$MH_INST_DIR$prefix/bin/refile" -run_test 'mhparam -nocomponent foldprot' '700' run_test 'mhparam -nocomponent formatproc' '' -run_test 'mhparam -nocomponent incproc' "$prefix/bin/inc" -run_test 'mhparam -nocomponent installproc' "$prefix/lib/install-mh" -run_test 'mhparam -nocomponent lproc' 'less' -run_test 'mhparam -nocomponent mailproc' "$prefix/bin/mhmail" -run_test 'mhparam -nocomponent mhlproc' "$MH_INST_DIR$prefix/lib/mhl" -run_test 'mhparam -nocomponent moreproc' 'less' -run_test 'mhparam -nocomponent msgprot' '600' -run_test 'mhparam -nocomponent mshproc' "$prefix/bin/msh" -run_test 'mhparam -nocomponent packproc' "$prefix/bin/packf" -run_test 'mhparam -nocomponent postproc' "$MH_INST_DIR$prefix/lib/post" run_test 'mhparam -nocomponent rmmproc' '' -run_test 'mhparam -nocomponent sendproc' "$prefix/bin/send" -run_test 'mhparam -nocomponent showmimeproc' "$prefix/bin/mhshow" -run_test 'mhparam -nocomponent showproc' "$MH_INST_DIR$prefix/lib/mhl" -run_test 'mhparam -nocomponent version' 'nmh-'`cat $MH_OBJ_DIR/VERSION` -run_test 'mhparam -nocomponent vmhproc' "$prefix/bin/msh" -run_test 'mhparam -nocomponent whatnowproc' "$prefix/bin/whatnow" -run_test 'mhparam -nocomponent whomproc' "$prefix/bin/whom" -run_test 'mhparam -nocomponent etcdir' "$prefix/etc" -run_test 'mhparam -nocomponent libdir' "$prefix/lib" -run_test 'mhparam -nocomponent sbackup' ',' # check -component run_test 'mhparam -component Path' "Path: $MH_TEST_DIR/Mail" -- 1.7.10.4