Extend the SANITIZE=leak testing mode added in 956d2e4639b (tests: add a test mode for SANITIZE=leak, run it in CI, 2021-09-23) to optionally be able to add a "suppressions" file to the $LSAN_OPTIONS. This allows for marking tests as passing with "TEST_PASSES_SANITIZE_LEAK=true" when they still have failure due more general widespread memory leaks, such as from the "git log" family of commands. We can now mark the "git -C" tests as passing. For getting specific tests to pass this is preferable to using UNLEAK() in these codepaths, as I'll have fixes for those leaks soon, and being able to atomically mark relevant tests as passing with "TEST_PASSES_SANITIZE_LEAK=true" helps to explain those changes. See [1] for more details. 1. https://lore.kernel.org/git/211022.86sfwtl6uj.gmgdl@xxxxxxxxxxxxxxxxxxx/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- On Fri, Oct 22 2021, Ævar Arnfjörð Bjarmason wrote: > On Fri, Oct 22 2021, Taylor Blau wrote: > >> On Thu, Oct 21, 2021 at 01:50:55PM +0200, Ævar Arnfjörð Bjarmason wrote: >>> >>> On Wed, Oct 20 2021, Taylor Blau wrote: [...] > If you want to pick that approach up and run with it I think it would > probably make sense to factor that suggested test_expect_success out > into a function in test-lib-functions.sh or whatever, and call it as > e.g.: > > TEST_PASSES_SANITIZE_LEAK=true > . ./test-lib.sh > declare_known_leaks <<-\EOF > add_rev_cmdline > [...] > EOF > > Then pipe it through sed 's/^/leak:/' and have it set LSAN_OPTIONS for > you. > > Doing it that way would be less boilerplate for each test that wants it, > and is also more likely to work with other non-LSAN leak appoaches, > i.e. as long as something can take a list of lines matching stack traces > we can feed that to that leak checker's idea of a whitelist. I just went ahead and hacked that up. If you're OK with that approach it would really help reduce the work for leak changes I've got planned, and as noted gives you the end-state of a passing 5319. I don't know if it makes more sense for you to base on top of this if/when Junio picks it up, or to integrate it into your series etc. Maybe Junio will chime in ... t/t0056-git-C.sh | 4 ++++ t/test-lib-functions.sh | 42 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/t/t0056-git-C.sh b/t/t0056-git-C.sh index 2630e756dab..490aefa81a1 100755 --- a/t/t0056-git-C.sh +++ b/t/t0056-git-C.sh @@ -2,7 +2,11 @@ test_description='"-C <path>" option and its effects on other path-related options' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh +todo_leaks <<-\EOF +^cmd_log_init_finish$ +EOF test_expect_success '"git -C <path>" runs git from the directory <path>' ' test_create_repo dir1 && diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index eef2262a360..d89bf5da7dc 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -243,6 +243,48 @@ debug () { done } +# Declare known "general" memory leaks, for use with TEST_PASSES_SANITIZE_LEAK=true. +# +# Matches lines in a stack trace that leaks. Intended for +# LSAN_OPTIONS, but the format is intended to be easy to use with +# other leak checkers, so the "leak:" prefix is omitted (and added for +# you). +# +# Use it immediately after sourcing test-lib.sh (or equivalent), and +# after a "TEST_PASSES_SANITIZE_LEAK=true" has been set. E.g: +# +# TEST_PASSES_SANITIZE_LEAK=true +# . ./test-lib.sh +# todo_leaks <<-\EOF +# ^cmd_log_init_finish$ +# EOF +# +# The "^" and "$" anchors don't suggest full regex syntax support, +# that's the only anchoring (or other metacharacter) understood by +# LSAN_OPTIONS,. +# +# See +# https://github.com/google/sanitizers/wiki/AddressSanitizerLeakSanitizer#suppressions +# for the relevant LSAN_OPTIONS documentation. +todo_leaks () { + if ! test_have_prereq SANITIZE_LEAK + then + return 0 + fi + + # Try not to interfere with any test logic + suppressions=.lsan-suppressions.txt + if test -d .git + then + suppressions=".git/$suppressions" + fi + suppressions="$PWD/$suppressions" + + sed 's/^/leak:/' >"$suppressions" && + LSAN_OPTIONS="$LSAN_OPTIONS:suppressions=\"$suppressions\"" && + export LSAN_OPTIONS +} + # Usage: test_commit [options] <message> [<file> [<contents> [<tag>]]] # -C <dir>: # Run all git commands in directory <dir> -- 2.33.1.1494.g88b39a443e1
