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

diff --git a/8a/d0f68ae557598c909bb7be24bb16bc4458521a b/8a/d0f68ae557598c909bb7be24bb16bc4458521a
new file mode 100644 (file)
index 0000000..503f11a
--- /dev/null
+++ b/8a/d0f68ae557598c909bb7be24bb16bc4458521a
@@ -0,0 +1,101 @@
+Return-Path: <pieter@praet.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 67451431FAF\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Feb 2012 12:39:21 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id mAnR6TdTubEM for <notmuch@notmuchmail.org>;\r
+       Wed,  1 Feb 2012 12:39:20 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9FA7C431FAE\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Feb 2012 12:39:20 -0800 (PST)\r
+Received: by werb10 with SMTP id b10so1463404wer.26\r
+       for <notmuch@notmuchmail.org>; Wed, 01 Feb 2012 12:39:19 -0800 (PST)\r
+Received: by 10.216.136.76 with SMTP id v54mr3432026wei.30.1328128759446;\r
+       Wed, 01 Feb 2012 12:39:19 -0800 (PST)\r
+Received: from localhost ([109.131.39.11])\r
+       by mx.google.com with ESMTPS id dw7sm32557073wib.4.2012.02.01.12.39.18\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 01 Feb 2012 12:39:19 -0800 (PST)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+Subject: [PATCH] test: replace occurrences of $PWD with vars that are more\r
+       stable\r
+Date: Wed,  1 Feb 2012 21:37:21 +0100\r
+Message-Id: <1328128641-31155-1-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.8.1\r
+In-Reply-To: <87ipjqb8c1.fsf@praet.org>\r
+References: <87ipjqb8c1.fsf@praet.org>\r
+Cc: Notmuch Mail <notmuch@notmuchmail.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 01 Feb 2012 20:39:21 -0000\r
+\r
+Thanks to Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+for pointing this out:  id:"87d39ymyb4.fsf@gmail.com"\r
+---\r
+ test/emacs |    2 +-\r
+ test/new   |    6 +++---\r
+ 2 files changed, 4 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index 17129b7..9c9d0b4 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -266,7 +266,7 @@ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: user@example.com\r
+ Subject: Re: Testing message sent via SMTP\r
+ In-Reply-To: <XXX>\r
+-Fcc: $(pwd)/mail/sent\r
++Fcc: ${MAIL_DIR}/sent\r
+ --text follows this line--\r
+ On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
+ > This is a test that messages are sent via SMTP\r
+diff --git a/test/new b/test/new\r
+index 49f390d..1b24c84 100755\r
+--- a/test/new\r
++++ b/test/new\r
+@@ -117,10 +117,10 @@ test_expect_equal "$output" "No new mail. Removed 3 messages."\r
+ test_begin_subtest "New symlink to directory"\r
+ \r
+ rm -rf "${MAIL_DIR}"/.notmuch\r
+-mv "${MAIL_DIR}" "$PWD"/actual_maildir\r
++mv "${MAIL_DIR}" "${TMP_DIRECTORY}"/actual_maildir\r
+ \r
+ mkdir "${MAIL_DIR}"\r
+-ln -s "$PWD"/actual_maildir "${MAIL_DIR}"/symlink\r
++ln -s "${TMP_DIRECTORY}"/actual_maildir "${MAIL_DIR}"/symlink\r
+ \r
+ output=$(NOTMUCH_NEW)\r
+ test_expect_equal "$output" "Added 1 new message to the database."\r
+@@ -128,7 +128,7 @@ test_expect_equal "$output" "Added 1 new message to the database."\r
+ \r
+ test_begin_subtest "New symlink to a file"\r
+ generate_message\r
+-external_msg_filename="$PWD"/external/"$(basename "$gen_msg_filename")"\r
++external_msg_filename="${TMP_DIRECTORY}"/external/"$(basename "$gen_msg_filename")"\r
+ mkdir -p "$(dirname "$external_msg_filename")"\r
+ mv "$gen_msg_filename" "$external_msg_filename"\r
+ ln -s "$external_msg_filename" "$gen_msg_filename"\r
+-- \r
+1.7.8.1\r