test: replace occurrences of $PWD with vars that are more stable

Thanks to Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
for pointing this out:  id:"87d39ymyb4.fsf@gmail.com"
This commit is contained in:
Pieter Praet 2012-02-01 21:37:21 +01:00 committed by David Bremner
parent d50171d1cc
commit b32831e5b8
2 changed files with 4 additions and 4 deletions

View file

@ -266,7 +266,7 @@ From: Notmuch Test Suite <test_suite@notmuchmail.org>
To: user@example.com To: user@example.com
Subject: Re: Testing message sent via SMTP Subject: Re: Testing message sent via SMTP
In-Reply-To: <XXX> In-Reply-To: <XXX>
Fcc: $(pwd)/mail/sent Fcc: ${MAIL_DIR}/sent
--text follows this line-- --text follows this line--
On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote: On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
> This is a test that messages are sent via SMTP > This is a test that messages are sent via SMTP

View file

@ -117,10 +117,10 @@ test_expect_equal "$output" "No new mail. Removed 3 messages."
test_begin_subtest "New symlink to directory" test_begin_subtest "New symlink to directory"
rm -rf "${MAIL_DIR}"/.notmuch rm -rf "${MAIL_DIR}"/.notmuch
mv "${MAIL_DIR}" "$PWD"/actual_maildir mv "${MAIL_DIR}" "${TMP_DIRECTORY}"/actual_maildir
mkdir "${MAIL_DIR}" mkdir "${MAIL_DIR}"
ln -s "$PWD"/actual_maildir "${MAIL_DIR}"/symlink ln -s "${TMP_DIRECTORY}"/actual_maildir "${MAIL_DIR}"/symlink
output=$(NOTMUCH_NEW) output=$(NOTMUCH_NEW)
test_expect_equal "$output" "Added 1 new message to the database." test_expect_equal "$output" "Added 1 new message to the database."
@ -128,7 +128,7 @@ test_expect_equal "$output" "Added 1 new message to the database."
test_begin_subtest "New symlink to a file" test_begin_subtest "New symlink to a file"
generate_message generate_message
external_msg_filename="$PWD"/external/"$(basename "$gen_msg_filename")" external_msg_filename="${TMP_DIRECTORY}"/external/"$(basename "$gen_msg_filename")"
mkdir -p "$(dirname "$external_msg_filename")" mkdir -p "$(dirname "$external_msg_filename")"
mv "$gen_msg_filename" "$external_msg_filename" mv "$gen_msg_filename" "$external_msg_filename"
ln -s "$external_msg_filename" "$gen_msg_filename" ln -s "$external_msg_filename" "$gen_msg_filename"