From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2MYBIwTFrGH1aQAAgWs5BA (envelope-from ) for ; Sun, 05 Dec 2021 14:56:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id KHDLHgTFrGGGAwAA1q6Kng (envelope-from ) for ; Sun, 05 Dec 2021 13:56:20 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 44D64C513 for ; Sun, 5 Dec 2021 14:56:20 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id EC7372880C; Sun, 5 Dec 2021 08:56:14 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 440A126AAB for ; Sun, 5 Dec 2021 08:56:12 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 28DC45FC42; Sun, 5 Dec 2021 08:56:12 -0500 (EST) Received: (nullmailer pid 970725 invoked by uid 1000); Sun, 05 Dec 2021 13:56:11 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH] test: remove directory names from paths in exceptions Date: Sun, 5 Dec 2021 09:56:03 -0400 Message-Id: <20211205135603.970709-1-david@tethera.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Message-ID-Hash: IYNL4RRYBKU3YC4DDFT36IJJIVIFOXAF X-Message-ID-Hash: IYNL4RRYBKU3YC4DDFT36IJJIVIFOXAF X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: FR ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638712580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=LtDFKI+XP6zjZTqORp2wPbJzppq9RdBT++PV17tAoQQ=; b=juBRh3VZYhhHkf2no8lSGCPX4SIpeC+6fOlXm4vvEDkXKwTl1zSXRTVaC6SsXtf1tZMfiN llgzmY7Ey7NFSR/I0C9R5vug9sVU6o2kfa4CmM1pRtinv/4TSL/ZXXmQKnDay+N55wPcwM 83vxGEZsJIuDvQTi4urkVUHttS8FnTN8W1YWGYHtBo4O1JNo5oKDL0OCYi8/4NJlEQnB1W NqB3sLlQ8T7MCHJvxXff1/XMt5IdLpY8NiwXrfLh+rQZ4gxlGk0TIKWEQpHfpSFsluHqZy lgXhZfcK9rJkD651iFyx/HLDymkIOCCaRTlgphj4v5+/nm/5SamczIGq24pxkw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638712580; a=rsa-sha256; cv=none; b=koLT7f4qfgzLLofzoodiOZYpLIcCINCMnRrjiGxSAOnuS9eqgydJgkv/AU/jvwK0HOpdeY jDZVN1aly+apqrA7B9Ahj2YhlreOeiOYxIS3kbjyybsenVqwA61awmiP6hqTd9bnCQd2Uw T+hOAlJTBfISfkS3yP206CBi+by1kx5efR//4MguJ28r3gIv4UGLHVR1hAP/Wx1sESg3T1 nf9Sv5UPl46wHRJc08+lyWZzccM3TUeqbj5CCRPEvrkeuCUe1LM3I8YAxithUuTXNb+bKz tADUxCR2bxulNaqBBxvpwdJDWtQMDglW4UmOaGq/rMN25vHGsZBMpsHL0tZrjA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.25 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 44D64C513 X-Spam-Score: -0.25 X-Migadu-Scanner: scn0.migadu.com X-TUID: 4IIVeR/huRUJ These cause failures when building out of tree. --- test/T562-lib-database.sh | 4 ++-- test/T563-lib-directory.sh | 4 ++-- test/test-lib.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/T562-lib-database.sh b/test/T562-lib-database.sh index d9f5d18e..2314efd2 100755 --- a/test/T562-lib-database.sh +++ b/test/T562-lib-database.sh @@ -80,7 +80,7 @@ cat < EXPECTED == stdout == 0 == stderr == -A Xapian exception occurred at lib/database.cc:XXX: Database has been closed +A Xapian exception occurred at database.cc:XXX: Database has been closed EOF test_expect_equal_file EXPECTED OUTPUT @@ -145,7 +145,7 @@ cat < EXPECTED == stdout == 1 == stderr == -A Xapian exception occurred at lib/database.cc:XXX: Database has been closed +A Xapian exception occurred at database.cc:XXX: Database has been closed EOF test_expect_equal_file EXPECTED OUTPUT diff --git a/test/T563-lib-directory.sh b/test/T563-lib-directory.sh index ad390c1c..ebd7fcb2 100755 --- a/test/T563-lib-directory.sh +++ b/test/T563-lib-directory.sh @@ -51,7 +51,7 @@ cat < EXPECTED == stdout == 1 == stderr == -A Xapian exception occurred at lib/directory.cc:XXX: Database has been closed +A Xapian exception occurred at directory.cc:XXX: Database has been closed EOF test_expect_equal_file EXPECTED OUTPUT @@ -68,7 +68,7 @@ cat < EXPECTED == stdout == 1 == stderr == -A Xapian exception occurred at lib/directory.cc:XXX: Database has been closed +A Xapian exception occurred at directory.cc:XXX: Database has been closed EOF test_expect_equal_file EXPECTED OUTPUT diff --git a/test/test-lib.sh b/test/test-lib.sh index e476a69b..6bc0b723 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -529,7 +529,7 @@ notmuch_debug_sanitize () { } notmuch_exception_sanitize () { - perl -pe 's/(A Xapian exception occurred at .*[.]cc?):([0-9]*)/\1:XXX/' + perl -pe 's,(A Xapian exception occurred at) .*?([^/]*[.]cc?):([0-9]*),\1 \2:XXX,' } notmuch_search_sanitize () { -- 2.33.0