2021-01-23 10:20:10 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='git ls-files --deduplicate test'
|
|
|
|
|
leak tests: mark passing SANITIZE=leak tests as leak-free
Mark those remaining tests that pass when run under SANITIZE=leak with
TEST_PASSES_SANITIZE_LEAK=true, these were either omitted in
f346fcb62a0 (Merge branch 'ab/mark-leak-free-tests-even-more',
2021-12-15) and 5a4f8381b68 (Merge branch 'ab/mark-leak-free-tests',
2021-10-25), or have had their memory leaks fixed since then.
With this change there's now a a one-to-one mapping between those
tests that we have opted-in via "TEST_PASSES_SANITIZE_LEAK=true", and
those that pass with the new "check" mode:
GIT_TEST_PASSING_SANITIZE_LEAK=check \
GIT_TEST_SANITIZE_LEAK_LOG=true \
make test SANITIZE=leak
Note that the "GIT_TEST_SANITIZE_LEAK_LOG=true" is needed due to the
edge cases noted in a preceding commit, i.e. in some cases we'd pass
the test itself, but still have outstanding leaks due to ignored exit
codes.
The "GIT_TEST_SANITIZE_LEAK_LOG=true" corrects for that, we're only
marking those tests as passing that really don't have any leaks,
whether that was reflected in their exit code or not.
Note that the change here to "t9100-git-svn-basic.sh" is marking that
test as passing under SANITIZE=leak, we're removing a
"TEST_FAILS_SANITIZE_LEAK=true" line, not
"TEST_PASSES_SANITIZE_LEAK=true". See 7a98d9ab00d (revisions API: have
release_revisions() release "cmdline", 2022-04-13) for the
introduction of that t/lib-git-svn.sh-specific variable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-27 23:13:41 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2021-01-23 10:20:10 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
>a.txt &&
|
|
|
|
>b.txt &&
|
|
|
|
>delete.txt &&
|
|
|
|
git add a.txt b.txt delete.txt &&
|
|
|
|
git commit -m base &&
|
|
|
|
echo a >a.txt &&
|
|
|
|
echo b >b.txt &&
|
|
|
|
echo delete >delete.txt &&
|
|
|
|
git add a.txt b.txt delete.txt &&
|
|
|
|
git commit -m tip &&
|
|
|
|
git tag tip &&
|
|
|
|
git reset --hard HEAD^ &&
|
|
|
|
echo change >a.txt &&
|
|
|
|
git commit -a -m side &&
|
|
|
|
git tag side
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git ls-files --deduplicate to show unique unmerged path' '
|
|
|
|
test_must_fail git merge tip &&
|
|
|
|
git ls-files --deduplicate >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
a.txt
|
|
|
|
b.txt
|
|
|
|
delete.txt
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git merge --abort
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git ls-files -d -m --deduplicate with different display options' '
|
|
|
|
git reset --hard side &&
|
|
|
|
test_must_fail git merge tip &&
|
|
|
|
rm delete.txt &&
|
|
|
|
git ls-files -d -m --deduplicate >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
a.txt
|
|
|
|
delete.txt
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git ls-files -d -m -t --deduplicate >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
C a.txt
|
|
|
|
C a.txt
|
|
|
|
C a.txt
|
|
|
|
R delete.txt
|
|
|
|
C delete.txt
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git ls-files -d -m -c --deduplicate >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
a.txt
|
|
|
|
b.txt
|
|
|
|
delete.txt
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git merge --abort
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|