[PATCH 3/3] test: canonicalize quotes in xapian error messages

diff --git a/4c/d45efeeb4f1e464d2c4d53cbad75f10c3f69f7 b/4c/d45efeeb4f1e464d2c4d53cbad75f10c3f69f7
new file mode 100644 (file)
index 0000000..772f102
--- /dev/null
+++ b/4c/d45efeeb4f1e464d2c4d53cbad75f10c3f69f7
@@ -0,0 +1,73 @@
+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 arlo.cworth.org (Postfix) with ESMTP id 1DB056DE014A\r
+ for <notmuch@notmuchmail.org>; Fri, 29 Jan 2016 03:53:37 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.309\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.309 tagged_above=-999 required=5 tests=[AWL=0.242,\r
+  RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] 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 87YuxaMbxrwH for <notmuch@notmuchmail.org>;\r
+ Fri, 29 Jan 2016 03:53:35 -0800 (PST)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 6F94A6DE0C11\r
+ for <notmuch@notmuchmail.org>; Fri, 29 Jan 2016 03:53:35 -0800 (PST)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1aP7bj-0001vq-66; Fri, 29 Jan 2016 06:52:55 -0500\r
+Received: (nullmailer pid 5660 invoked by uid 1000);\r
+ Fri, 29 Jan 2016 11:53:30 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] test: canonicalize quotes in xapian error messages\r
+Date: Fri, 29 Jan 2016 07:53:13 -0400\r
+Message-Id: <1454068393-5406-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.6.4\r
+In-Reply-To: <1454068393-5406-1-git-send-email-david@tethera.net>\r
+References: <1454068393-5406-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 29 Jan 2016 11:53:37 -0000\r
+\r
+These differ between 1.2 and 1.3, so we transform the 1.2 backquote to a\r
+single quote for compatibility\r
+---\r
+ test/T360-symbol-hiding.sh | 4 ++--\r
+ 1 file changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh\r
+index 4ec0ea6..89e7f16 100755\r
+--- a/test/T360-symbol-hiding.sh\r
++++ b/test/T360-symbol-hiding.sh\r
+@@ -15,11 +15,11 @@ test_begin_subtest 'running test' run_test\r
+ mkdir -p ${PWD}/fakedb/.notmuch\r
+ ( LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \\r
+                $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent \\r
+-               2>&1 | sed "s,${PWD},CWD,g") > OUTPUT\r
++               2>&1 | notmuch_dir_sanitize | sed "s,\`,\',g") > OUTPUT\r
+ \r
+ cat <<EOF > EXPECTED\r
+ A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian'\r
+-caught No chert database found at path \`CWD/nonexistent'\r
++caught No chert database found at path 'CWD/nonexistent'\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+ \r
+-- \r
+2.6.4\r
+\r