unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH] test: remove directory names from paths in exceptions
@ 2021-12-05 13:56 David Bremner
  2021-12-23 12:54 ` David Bremner
  0 siblings, 1 reply; 2+ messages in thread
From: David Bremner @ 2021-12-05 13:56 UTC (permalink / raw)
  To: notmuch

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 <<EOF > 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 <<EOF > 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 <<EOF > 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 <<EOF > 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] test: remove directory names from paths in exceptions
  2021-12-05 13:56 [PATCH] test: remove directory names from paths in exceptions David Bremner
@ 2021-12-23 12:54 ` David Bremner
  0 siblings, 0 replies; 2+ messages in thread
From: David Bremner @ 2021-12-23 12:54 UTC (permalink / raw)
  To: notmuch

David Bremner <david@tethera.net> writes:

> 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(-)

applied to master.

d

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-12-23 12:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-05 13:56 [PATCH] test: remove directory names from paths in exceptions David Bremner
2021-12-23 12:54 ` David Bremner

Code repositories for project(s) associated with this inbox:

	notmuch.git.git (no URL configured)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).