[PATCH] test: use test_expect_equal for PATH test, update message

diff --git a/5d/f263b8a070f6573152c7d86a80c74d9bb0b738 b/5d/f263b8a070f6573152c7d86a80c74d9bb0b738
new file mode 100644 (file)
index 0000000..664106d
--- /dev/null
+++ b/5d/f263b8a070f6573152c7d86a80c74d9bb0b738
@@ -0,0 +1,80 @@
+Return-Path: <bremner@tethera.net>\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 A039F431FBD\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Apr 2014 05:43:03 -0700 (PDT)\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 aqvPe9rUHKaL for <notmuch@notmuchmail.org>;\r
+       Sun, 13 Apr 2014 05:42:58 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 23A0F431FBC\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Apr 2014 05:42:58 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WZJkN-0004Wz-HV; Sun, 13 Apr 2014 09:42:55 -0300\r
+Received: (nullmailer pid 8801 invoked by uid 1000); Sun, 13 Apr 2014\r
+       12:42:51 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: use test_expect_equal for PATH test, update message\r
+Date: Sun, 13 Apr 2014 09:42:49 -0300\r
+Message-Id: <1397392969-8735-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.9.1\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: Sun, 13 Apr 2014 12:43:03 -0000\r
+\r
+- The old test was quite impossible to debug; the new one shows the difference\r
+  between the two directories, if any.\r
+\r
+- "repository" doesn't make sense for out of tree builds. Or tarball\r
+  builds, for that matter.\r
+---\r
+\r
+I was tracking down a weird issue with out of tree builds. I didn't\r
+find the issue (it may have just been cruft from a previously broken\r
+build). In any case, I think the patch is a small improvement.\r
+\r
+ test/T000-basic.sh | 7 ++++---\r
+ 1 file changed, 4 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/test/T000-basic.sh b/test/T000-basic.sh\r
+index 9c94b62..ebbb6d2 100755\r
+--- a/test/T000-basic.sh\r
++++ b/test/T000-basic.sh\r
+@@ -86,8 +86,9 @@ test_expect_success \\r
+     'NOTMUCH_CONFIG is set and points to an existing file' \\r
+     'test -f "${NOTMUCH_CONFIG}"'\r
+ \r
+-test_expect_success \\r
+-    'PATH is set to this repository' \\r
+-    'test "`echo $PATH|cut -f1 -d: | sed -e 's,/test/valgrind/bin$,,'`" = "`dirname ${TEST_DIRECTORY}`"'\r
++test_begin_subtest 'PATH is set to build directory'\r
++test_expect_equal \\r
++    "$(dirname ${TEST_DIRECTORY})" \\r
++    "$(echo $PATH|cut -f1 -d: | sed -e 's,/test/valgrind/bin$,,')"\r
+ \r
+ test_done\r
+-- \r
+1.9.1\r
+\r