Re: [PATCH] test: Always use paths without symlinks

diff --git a/59/452be995b3304643320fd9abc3cddaf40e95de b/59/452be995b3304643320fd9abc3cddaf40e95de
new file mode 100644 (file)
index 0000000..5f528e0
--- /dev/null
+++ b/59/452be995b3304643320fd9abc3cddaf40e95de
@@ -0,0 +1,103 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id B94466DE17BE\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Dec 2015 03:13:57 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.684\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.684 tagged_above=-999 required=5 tests=[AWL=0.032, \r
+ SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 408MCabjgbKF for <notmuch@notmuchmail.org>;\r
+ Tue, 29 Dec 2015 03:13:55 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id F264C6DE17BA\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Dec 2015 03:13:54 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 9578F10008C;\r
+ Tue, 29 Dec 2015 13:14:12 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Michal Sojka <sojkam1@fel.cvut.cz>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: Always use paths without symlinks\r
+In-Reply-To: <1451381426-17777-1-git-send-email-sojkam1@fel.cvut.cz>\r
+References: <1451381426-17777-1-git-send-email-sojkam1@fel.cvut.cz>\r
+User-Agent: Notmuch/0.21+32~g73439f8 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 29 Dec 2015 13:14:12 +0200\r
+Message-ID: <m21ta5ik1n.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 29 Dec 2015 11:13:58 -0000\r
+\r
+On Tue, Dec 29 2015, Michal Sojka <sojkam1@fel.cvut.cz> wrote:\r
+\r
+> When notmuch sources are at a symlinked path, some tests fail because\r
+> one part of the test uses physical path and another uses logical\r
+> path (with symlinks). For example the following test output is\r
+> produced when the test is started from /home/src/symlink-to-notmuch,\r
+> which is a symlink to /home/src/notmuch.\r
+>\r
+>     FAIL   notmuch-fcc-dirs set to a string\r
+>         --- T310-emacs.26.OUTPUT        2015-12-29 08:54:29.055878637 +0000\r
+>         +++ T310-emacs.26.EXPECTED      2015-12-29 08:54:29.055878637 +0000\r
+>         @@ -1,5 +1,5 @@\r
+>          From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+>          To:\r
+>          Subject:\r
+>         -Fcc: /home/src/notmuch/test/tmp.T310-emacs/mail/sent-string\r
+>         +Fcc: /home/src/symlink-to-notmuch/test/tmp.T310-emacs/mail/sent-string\r
+>          --text follows this line--\r
+>     nil\r
+>\r
+> This commit makes all paths in test scripts physical. With it, all\r
+> tests pass even when run from a symlinked directory.\r
+\r
+Looks good, is portable (bash builtin) and seems also fix cases I thought\r
+might have been a problem instead.\r
+\r
+Tomi\r
+\r
+\r
+> ---\r
+>  test/test-lib-common.sh | 2 +-\r
+>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>\r
+> diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh\r
+> index 5eb618c..4e17b78 100644\r
+> --- a/test/test-lib-common.sh\r
+> +++ b/test/test-lib-common.sh\r
+> @@ -48,7 +48,7 @@ restore_database () {\r
+>  \r
+>  # Test the binaries we have just built.  The tests are kept in\r
+>  # test/ subdirectory and are run in 'trash directory' subdirectory.\r
+> -TEST_DIRECTORY=$(pwd)\r
+> +TEST_DIRECTORY=$(pwd -P)\r
+>  notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`\r
+>  \r
+>  # configure output\r
+> -- \r
+> 2.6.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> https://notmuchmail.org/mailman/listinfo/notmuch\r