Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/nmh

[nmh] / test / format / test-mymbox

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index 040390c95380b8c4969714cf142f4b634c3eaea7..753f92e797cb09bff146b01dc23918480dd438bd 100755 (executable)
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -17,14 +17,14 @@ 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`
-host=`${MH_OBJ_DIR}/test/getfqdn`
+user=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(me)' 0`
+host=`${MH_OBJ_DIR}/test/getcanon`
 
-output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}"`
+output=`run_prog ${MH_LIBEXEC_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_LIBEXEC_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" \
+run_test "${MH_LIBEXEC_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \
          0 "Basic non-matching test"
 
 myname="Random User <random@user.something.com>"
@@ -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_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \
          1 "Local-Mailbox test"
 
-output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
+output=`run_prog ${MH_LIBEXEC_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_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \
          1 "Local-Mailbox with Alternate-Mailbox test"
 
 exit $failed