[PATCH 1/1] test: always source test-lib.sh as ./test-lib.sh

diff --git a/e8/4cb623213842b00415ae06decf8c60f7ad4592 b/e8/4cb623213842b00415ae06decf8c60f7ad4592
new file mode 100644 (file)
index 0000000..8ae8bc6
--- /dev/null
+++ b/e8/4cb623213842b00415ae06decf8c60f7ad4592
@@ -0,0 +1,183 @@
+Return-Path: <too@guru-group.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 olra.theworths.org (Postfix) with ESMTP id 3820D431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Nov 2012 07:16:23 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 tyIOS1uHjnTe for <notmuch@notmuchmail.org>;\r
+       Wed, 21 Nov 2012 07:16:19 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id C09C5431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Nov 2012 07:16:18 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 1151F100148; Wed, 21 Nov 2012 17:16:16 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/1] test: always source test-lib.sh as ./test-lib.sh\r
+Date: Wed, 21 Nov 2012 17:16:14 +0200\r
+Message-Id: <1353510974-7084-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+Cc: tomi.ollila@iki.fi, Tomi Ollila <too@iki.fi>\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, 21 Nov 2012 15:16:23 -0000\r
+\r
+From: Tomi Ollila <too@iki.fi>\r
+\r
+There are currently 45 TESTS scripts. 36 of those load\r
+test-lib.sh using '. ./test-lib.sh' and 9 '. test-lib.sh'.\r
+\r
+In latter case test-lib.sh is first searched from directories\r
+in PATH (posix) and then from current directory (bash feature).\r
+\r
+Changed the 9 files to execute '. ./test-lib.sh'. The test-lib.sh\r
+should never be loaded from directory in PATH.\r
+---\r
+ test/config                    | 2 +-\r
+ test/emacs                     | 2 +-\r
+ test/emacs-address-cleaning    | 2 +-\r
+ test/emacs-hello               | 2 +-\r
+ test/emacs-large-search-buffer | 2 +-\r
+ test/emacs-show                | 2 +-\r
+ test/emacs-subject-to-filename | 2 +-\r
+ test/emacs-test-functions      | 2 +-\r
+ test/help-test                 | 2 +-\r
+ 9 files changed, 9 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/test/config b/test/config\r
+index 93ecb13..cfa1f32 100755\r
+--- a/test/config\r
++++ b/test/config\r
+@@ -1,7 +1,7 @@\r
+ #!/usr/bin/env bash\r
+ \r
+ test_description='"notmuch config"'\r
+-. test-lib.sh\r
++. ./test-lib.sh\r
+ \r
+ test_begin_subtest "Get string value"\r
+ test_expect_equal "$(notmuch config get user.name)" "Notmuch Test Suite"\r
+diff --git a/test/emacs b/test/emacs\r
+index 77265b0..ba3bbd0 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -1,7 +1,7 @@\r
+ #!/usr/bin/env bash\r
+ \r
+ test_description="emacs interface"\r
+-. test-lib.sh\r
++. ./test-lib.sh\r
+ \r
+ EXPECTED=$TEST_DIRECTORY/emacs.expected-output\r
+ \r
+diff --git a/test/emacs-address-cleaning b/test/emacs-address-cleaning\r
+index 6ddde5c..0472346 100755\r
+--- a/test/emacs-address-cleaning\r
++++ b/test/emacs-address-cleaning\r
+@@ -1,7 +1,7 @@\r
+ #!/usr/bin/env bash\r
+ \r
+ test_description="emacs address cleaning"\r
+-. test-lib.sh\r
++. ./test-lib.sh\r
+ \r
+ test_begin_subtest "notmuch-test-address-clean part 1"\r
+ test_emacs_expect_t '(notmuch-test-address-cleaning-1)'\r
+diff --git a/test/emacs-hello b/test/emacs-hello\r
+index 48d1420..f729616 100755\r
+--- a/test/emacs-hello\r
++++ b/test/emacs-hello\r
+@@ -1,7 +1,7 @@\r
+ #!/usr/bin/env bash\r
+ \r
+ test_description="emacs notmuch-hello view"\r
+-. test-lib.sh\r
++. ./test-lib.sh\r
+ \r
+ EXPECTED=$TEST_DIRECTORY/emacs.expected-output\r
+ \r
+diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer\r
+index 4351e33..678328d 100755\r
+--- a/test/emacs-large-search-buffer\r
++++ b/test/emacs-large-search-buffer\r
+@@ -1,6 +1,6 @@\r
+ #!/usr/bin/env bash\r
+ test_description="Emacs with large search results buffer"\r
+-. test-lib.sh\r
++. ./test-lib.sh\r
+ \r
+ x=xxxxxxxxxx # 10\r
+ x=$x$x$x$x$x$x$x$x$x$x # 100\r
+diff --git a/test/emacs-show b/test/emacs-show\r
+index ec3be8b..b670abf 100755\r
+--- a/test/emacs-show\r
++++ b/test/emacs-show\r
+@@ -1,7 +1,7 @@\r
+ #!/usr/bin/env bash\r
+ \r
+ test_description="emacs notmuch-show view"\r
+-. test-lib.sh\r
++. ./test-lib.sh\r
+ \r
+ EXPECTED=$TEST_DIRECTORY/emacs-show.expected-output\r
+ \r
+diff --git a/test/emacs-subject-to-filename b/test/emacs-subject-to-filename\r
+index a0ffdfe..43529a4 100755\r
+--- a/test/emacs-subject-to-filename\r
++++ b/test/emacs-subject-to-filename\r
+@@ -1,7 +1,7 @@\r
+ #!/usr/bin/env bash\r
+ \r
+ test_description="emacs: mail subject to filename"\r
+-. test-lib.sh\r
++. ./test-lib.sh\r
+ \r
+ # emacs server can't be started in a child process with $(test_emacs ...)\r
+ test_emacs '(ignore)'\r
+diff --git a/test/emacs-test-functions b/test/emacs-test-functions\r
+index 0e1f9fc..ca4a798 100755\r
+--- a/test/emacs-test-functions\r
++++ b/test/emacs-test-functions\r
+@@ -1,7 +1,7 @@\r
+ #!/usr/bin/env bash\r
+ \r
+ test_description="emacs test function sanity"\r
+-. test-lib.sh\r
++. ./test-lib.sh\r
+ \r
+ test_begin_subtest "emacs test function sanity"\r
+ test_emacs_expect_t 't'\r
+diff --git a/test/help-test b/test/help-test\r
+index 9f4b9c7..f7df725 100755\r
+--- a/test/help-test\r
++++ b/test/help-test\r
+@@ -1,7 +1,7 @@\r
+ #!/usr/bin/env bash\r
+ \r
+ test_description="online help"\r
+-. test-lib.sh\r
++. ./test-lib.sh\r
+ \r
+ test_expect_success 'notmuch --help' 'notmuch --help'\r
+ test_expect_success 'notmuch --help tag' 'notmuch --help tag'\r
+-- \r
+1.7.11.7\r
+\r