diff options
| author | David Bremner <david@tethera.net> | 2021-12-05 09:56:03 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-12-23 08:47:40 -0400 |
| commit | cea1604a087645d07998c6986a8678b2af239322 (patch) | |
| tree | 59a29b3bf31f7f1188a38bd45b164f9352098259 | |
| parent | 031f4b4da5b317c580df474d002a8300d35a818e (diff) | |
test: remove directory names from paths in exceptions
These cause failures when building out of tree.
| -rwxr-xr-x | test/T562-lib-database.sh | 4 | ||||
| -rwxr-xr-x | test/T563-lib-directory.sh | 4 | ||||
| -rw-r--r-- | 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 () { |