[PATCH v2 2/5] test: Made T010-help-test and T020-compact tests more portable.

diff --git a/b1/721309e250188175562186df669c5fe68ad233 b/b1/721309e250188175562186df669c5fe68ad233
new file mode 100644 (file)
index 0000000..335a72a
--- /dev/null
+++ b/b1/721309e250188175562186df669c5fe68ad233
@@ -0,0 +1,121 @@
+Return-Path: <cceleri@cs.stanford.edu>\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 2329E431FC0\r
+       for <notmuch@notmuchmail.org>; Sat, 10 May 2014 08:53:58 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 JnvqomgQwVnH for <notmuch@notmuchmail.org>;\r
+       Sat, 10 May 2014 08:53:50 -0700 (PDT)\r
+Received: from smtp1.cs.Stanford.EDU (smtp1.cs.Stanford.EDU [171.64.64.25])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 877BF431FBF\r
+       for <notmuch@notmuchmail.org>; Sat, 10 May 2014 08:53:50 -0700 (PDT)\r
+Received: from c-24-11-133-78.hsd1.sc.comcast.net ([24.11.133.78]\r
+       helo=jane.lan)\r
+       by smtp1.cs.Stanford.EDU with esmtpsa (TLSv1:DHE-RSA-SEED-SHA:128)\r
+       (Exim 4.80.1) (envelope-from <cceleri@cs.stanford.edu>)\r
+       id 1Wj9at-0006x1-Hi; Sat, 10 May 2014 08:53:48 -0700\r
+From: Charles Celerier <cceleri@cs.stanford.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/5] test: Made T010-help-test and T020-compact tests more\r
+       portable.\r
+Date: Sat, 10 May 2014 11:53:44 -0400\r
+Message-Id: <1399737224-79348-1-git-send-email-cceleri@cs.stanford.edu>\r
+X-Mailer: git-send-email 1.8.5.2 (Apple Git-48)\r
+In-Reply-To: <id:1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu>\r
+References: <id:1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu>\r
+X-Scan-Signature: 34530ccd932157cd24ba9d2c27818ca4\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: Sat, 10 May 2014 15:53:58 -0000\r
+\r
+The tests T010-help-test and T020-compact use the files have-man and\r
+have-compact, respectively, as indicators of how notmuch is configured.\r
+These were symbolic links to true and false for use in bash tests.\r
+Unfortunately, the paths to true and false may not be the same on all\r
+platforms (e.g. on Mac OS X they are in /usr/bin), so hard-coding\r
+symbolic links to /bin/true and /bin/false is not portable. This patch\r
+writes a 1 to have-man and have-compact to indicate true, and a 0 to\r
+indicate false, instead. The tests now read the contents of the file to\r
+determine the truth value instead of following the symbolic link.\r
+\r
+Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>\r
+---\r
+ test/Makefile.local    | 8 ++++----\r
+ test/T010-help-test.sh | 2 +-\r
+ test/T020-compact.sh   | 2 +-\r
+ 3 files changed, 6 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index d622eaf..8fd333c 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -37,16 +37,16 @@ $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o\r
+ \r
+ $(dir)/have-compact: Makefile.config\r
+ ifeq ($(HAVE_XAPIAN_COMPACT),1)\r
+-      ln -sf /bin/true $@\r
++      echo 1 > $@\r
+ else\r
+-      ln -sf /bin/false $@\r
++      echo 0 > $@\r
+ endif\r
+ \r
+ $(dir)/have-man: Makefile.config\r
+ ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)\r
+-      ln -sf /bin/false $@\r
++      echo 0 > $@\r
+ else\r
+-      ln -sf /bin/true $@\r
++      echo 1 > $@\r
+ endif\r
+ \r
+ .PHONY: test check\r
+diff --git a/test/T010-help-test.sh b/test/T010-help-test.sh\r
+index 77410bc..02162ca 100755\r
+--- a/test/T010-help-test.sh\r
++++ b/test/T010-help-test.sh\r
+@@ -7,7 +7,7 @@ test_expect_success 'notmuch --help' 'notmuch --help'\r
+ test_expect_success 'notmuch help' 'notmuch help'\r
+ test_expect_success 'notmuch --version' 'notmuch --version'\r
+ \r
+-if ${TEST_DIRECTORY}/have-man; then\r
++if grep -q 1 ${TEST_DIRECTORY}/have-man ; then\r
+     test_expect_success 'notmuch --help tag' 'notmuch --help tag'\r
+     test_expect_success 'notmuch help tag' 'notmuch help tag'\r
+ else\r
+diff --git a/test/T020-compact.sh b/test/T020-compact.sh\r
+index 77bb963..0139584 100755\r
+--- a/test/T020-compact.sh\r
++++ b/test/T020-compact.sh\r
+@@ -10,7 +10,7 @@ notmuch tag +tag1 \*\r
+ notmuch tag +tag2 subject:Two\r
+ notmuch tag -tag1 +tag3 subject:Three\r
+ \r
+-if ! ${TEST_DIRECTORY}/have-compact; then\r
++if grep -q 0 ${TEST_DIRECTORY}/have-compact; then\r
+     test_begin_subtest "Compact unsupported: error message"\r
+     output=$(notmuch compact --quiet 2>&1)\r
+     test_expect_equal "$output" "notmuch was compiled against a xapian version lacking compaction support.\r
+-- \r
+1.8.5.2 (Apple Git-48)\r
+\r