[PATCH 2/2] test: move nonexistent directory to something under notmuch's control.

diff --git a/a0/a9e927fce0f3038e7dcb1f5b2e6948f1dffd87 b/a0/a9e927fce0f3038e7dcb1f5b2e6948f1dffd87
new file mode 100644 (file)
index 0000000..63a48dc
--- /dev/null
+++ b/a0/a9e927fce0f3038e7dcb1f5b2e6948f1dffd87
@@ -0,0 +1,115 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 B33726DE1AFD\r
+ for <notmuch@notmuchmail.org>; Wed,  8 Apr 2015 07:47:32 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.399\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.399 tagged_above=-999 required=5 tests=[AWL=0.389, \r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] 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 Z4AcENyUAizz for <notmuch@notmuchmail.org>;\r
+ Wed,  8 Apr 2015 07:47:31 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+ [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id F10026DE1B74\r
+ for <notmuch@notmuchmail.org>; Wed,  8 Apr 2015 07:47:30 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+ 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1YfrFD-0005G5-Oe; Wed, 08 Apr 2015 14:46:19 +0000\r
+Received: (nullmailer pid 18409 invoked by uid 1000); Wed, 08 Apr 2015\r
+ 14:45:45 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, David Bremner <david@tethera.net>,\r
+ notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] test: move nonexistent directory to something under\r
+ notmuch's control.\r
+Date: Wed,  8 Apr 2015 23:45:37 +0900\r
+Message-Id: <1428504337-18362-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1428504337-18362-1-git-send-email-david@tethera.net>\r
+References: <m2h9sst92b.fsf@guru.guru-group.fi>\r
+ <1428504337-18362-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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, 08 Apr 2015 14:47:32 -0000\r
+\r
+Apparently some systems actually have a directory called /nonexist[ae]nt.\r
+It's hard to fathom a good reason for that, but oh well. As long as we\r
+don't create such a directory inside the notmuch source tree, the new\r
+version should be more robust.\r
+---\r
+ test/T560-lib-error.sh | 12 ++++++------\r
+ 1 file changed, 6 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh\r
+index 6947aa8..c99b17e 100755\r
+--- a/test/T560-lib-error.sh\r
++++ b/test/T560-lib-error.sh\r
+@@ -43,13 +43,13 @@ int main (int argc, char** argv)\r
+ {\r
+     notmuch_database_t *db;\r
+     notmuch_status_t stat;\r
+-    stat = notmuch_database_open ("/nonexistent/foo", 0, 0);\r
++    stat = notmuch_database_open ("./nonexistent/foo", 0, 0);\r
+ }\r
+ EOF\r
+ cat <<'EOF' >EXPECTED\r
+ == stdout ==\r
+ == stderr ==\r
+-Error opening database at /nonexistent/foo/.notmuch: No such file or directory\r
++Error opening database at ./nonexistent/foo/.notmuch: No such file or directory\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+ \r
+@@ -78,13 +78,13 @@ int main (int argc, char** argv)\r
+ {\r
+     notmuch_database_t *db;\r
+     notmuch_status_t stat;\r
+-    stat = notmuch_database_create ("/nonexistent/foo", &db);\r
++    stat = notmuch_database_create ("./nonexistent/foo", &db);\r
+ }\r
+ EOF\r
+ cat <<'EOF' >EXPECTED\r
+ == stdout ==\r
+ == stderr ==\r
+-Error: Cannot create database at /nonexistent/foo: No such file or directory.\r
++Error: Cannot create database at ./nonexistent/foo: No such file or directory.\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+ \r
+@@ -125,7 +125,7 @@ int main (int argc, char** argv)\r
+    if (stat != NOTMUCH_STATUS_SUCCESS) {\r
+      fprintf (stderr, "error opening database: %d\n", stat);\r
+    }\r
+-   stat = notmuch_database_add_message (db, "/nonexistent", NULL);\r
++   stat = notmuch_database_add_message (db, "./nonexistent", NULL);\r
+    if (stat) {\r
+        char *status_string = notmuch_database_status_string (db);\r
+        if (status_string) fputs (status_string, stderr);\r
+@@ -135,7 +135,7 @@ EOF\r
+ cat <<'EOF' >EXPECTED\r
+ == stdout ==\r
+ == stderr ==\r
+-Error opening /nonexistent: No such file or directory\r
++Error opening ./nonexistent: No such file or directory\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+ \r
+-- \r
+2.1.4\r
+\r