summaryrefslogtreecommitdiff
path: root/t/t4300-merge-tree.sh
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2021-10-12 15:56:45 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 18:23:24 -0700
commit7ff24785cb7e1655f1295dce3e0269348bbbbe02 (patch)
treeb2dedbdaba4b0d4ad497f59837d73297f145135e /t/t4300-merge-tree.sh
parentleak tests: mark various "generic" tests as passing with SANITIZE=leak (diff)
downloadtgif-7ff24785cb7e1655f1295dce3e0269348bbbbe02.tar.xz
leak tests: mark some misc tests as passing with SANITIZE=leak
Mark some tests that match "*{mktree,commit,diff,grep,rm,merge,hunk}*" as passing when git is compiled with SANITIZE=leak. They'll now be listed as running under the "GIT_TEST_PASSING_SANITIZE_LEAK=true" test mode (the "linux-leaks" CI target). These were picked because we still have a lot of failures in adjacent areas, and we didn't have much if any coverage of e.g. grep and diff before this change, we could still whitelist a lot more tests, but let's stop for now. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4300-merge-tree.sh')
-rwxr-xr-xt/t4300-merge-tree.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index e59601e5fe..c52c8a21fa 100755
--- a/t/t4300-merge-tree.sh
+++ b/t/t4300-merge-tree.sh
@@ -4,6 +4,8 @@
#
test_description='git merge-tree'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '