summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2021-10-31 00:24:10 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-01 11:23:07 -0700
commit4ea08416b8eab6232cf47c7dde53895754956034 (patch)
treee85bd7c32c3d7dba4b23badda5f95f36d55919e0
parenti18n: fix typos found during l10n for git 2.34.0 (diff)
downloadtgif-4ea08416b8eab6232cf47c7dde53895754956034.tar.xz
leak tests: mark a read-tree test as passing SANITIZE=leak
The "t1002-read-tree-m-u-2way.sh" test has passed under SANITIZE=leak since 04988c8d182 (unpack-trees: introduce preserve_ignored to unpack_trees_options, 2021-09-27) was combined with e5a917fcf42 (unpack-trees: don't leak memory in verify_clean_subdirectory(), 2021-10-07), but as both were in-flight at the time neither could mark it as passing. It will now be listed as running under the "GIT_TEST_PASSING_SANITIZE_LEAK=true" test mode (the "linux-leaks" CI target). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1002-read-tree-m-u-2way.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index 9c05f5e1f5..ca5c5510c7 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -8,6 +8,8 @@ test_description='Two way merge with read-tree -m -u $H $M
This is identical to t1001, but uses -u to update the work tree as well.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh