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