Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 2DB636DE1992 for ; Tue, 7 Apr 2015 05:16:09 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.442 X-Spam-Level: X-Spam-Status: No, score=0.442 tagged_above=-999 required=5 tests=[AWL=0.432, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iWeFvyZzioDp for ; Tue, 7 Apr 2015 05:16:07 -0700 (PDT) Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net [87.98.215.224]) by arlo.cworth.org (Postfix) with ESMTPS id 04A226DE198A for ; Tue, 7 Apr 2015 05:16:06 -0700 (PDT) Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim 4.80) (envelope-from ) id 1YfSPZ-0000ki-2M; Tue, 07 Apr 2015 12:15:21 +0000 Received: (nullmailer pid 22901 invoked by uid 1000); Tue, 07 Apr 2015 12:15:03 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH] test: move nonexistant directory to something under notmuch's control. Date: Tue, 7 Apr 2015 21:15:00 +0900 Message-Id: <1428408900-22839-1-git-send-email-david@tethera.net> X-Mailer: git-send-email 2.1.4 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 12:16:09 -0000 Apparently some systems actually have a directory called /nonexistent. It's hard to fathom a good reason for that, but oh well. As long as we don't create such a directory inside the notmuch source tree, the new version should be more robust. --- This should (hopefully) fix the current failures on travis test/T560-lib-error.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index 828a44b..57abb28 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -43,13 +43,13 @@ int main (int argc, char** argv) { notmuch_database_t *db; notmuch_status_t stat; - stat = notmuch_database_open ("/nonexistent/foo", 0, 0); + stat = notmuch_database_open ("./nonexistent/foo", 0, 0); } EOF cat <<'EOF' >EXPECTED == stdout == == stderr == -Error opening database at /nonexistent/foo/.notmuch: No such file or directory +Error opening database at ./nonexistent/foo/.notmuch: No such file or directory EOF test_expect_equal_file EXPECTED OUTPUT -- 2.1.4