X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2734ae8bfd1261aae65da3e14453dcfc1896f8d4..4c3e318359b95628f68757f834bad40e36320a2f:/test/format/test-mymbox diff --git a/test/format/test-mymbox b/test/format/test-mymbox index 0221fad2..f71a3c92 100755 --- a/test/format/test-mymbox +++ b/test/format/test-mymbox @@ -17,12 +17,12 @@ setup_test #### Local-Mailbox profile component, which we don't use in the test #### suite, or the user's login name. ap will escape (quote) it if #### needed. -user=`${MH_LIB_DIR}/ap -format '%(me)' 0` +user=`run_prog ${MH_LIB_DIR}/ap -format '%(me)' 0` host=`${MH_OBJ_DIR}/test/getcanon` -output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}"` +output=`run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}"` run_test "echo $output" 1 "Basic user test" -output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"` +output=`run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"` run_test "echo $output" 1 "Basic user@host test" run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \ 0 "Basic non-matching test" @@ -35,17 +35,19 @@ grep -v 'Local-Mailbox: ' ${MH} > ${MH}.new mv -f ${MH}.new ${MH} echo "Local-Mailbox: ${myname}" >> ${MH} -run_test "echo `${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \ +run_test "echo \ + `run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \ 1 "Local-Mailbox test" -output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"` +output=`run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"` run_test "echo $output" 0 "Local-mailbox overriding user@host test" # Add an Alternate-Mailbox. This caused ismymbox() to lose the # Local-Mailbox, Bug #36635: -nocc me doesn't account for # Alternate-Mailboxes. printf 'Alternate-Mailboxes: user@example.com\n' >> $MH -run_test "echo `${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \ +run_test "echo \ + `run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \ 1 "Local-Mailbox with Alternate-Mailbox test" exit $failed