test: remove directory names from paths in exceptions

These cause failures when building out of tree.
This commit is contained in:
David Bremner 2021-12-05 09:56:03 -04:00
parent 031f4b4da5
commit cea1604a08
3 changed files with 5 additions and 5 deletions

View file

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

View file

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

View file

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