3e3b9321ca
Mark those remaining tests that pass when run under SANITIZE=leak with TEST_PASSES_SANITIZE_LEAK=true, these were either omitted inf346fcb62a(Merge branch 'ab/mark-leak-free-tests-even-more', 2021-12-15) and5a4f8381b6(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". See7a98d9ab00(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>
49 lines
1019 B
Bash
Executable File
49 lines
1019 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='merge conflict in crlf repo
|
|
|
|
b---M
|
|
/ /
|
|
initial---a
|
|
|
|
'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
git config core.autocrlf true &&
|
|
echo foo | append_cr >file &&
|
|
git add file &&
|
|
git commit -m "Initial" &&
|
|
git tag initial &&
|
|
git branch side &&
|
|
echo line from a | append_cr >file &&
|
|
git commit -m "add line from a" file &&
|
|
git tag a &&
|
|
git checkout side &&
|
|
echo line from b | append_cr >file &&
|
|
git commit -m "add line from b" file &&
|
|
git tag b &&
|
|
git checkout main
|
|
'
|
|
|
|
test_expect_success 'Check "ours" is CRLF' '
|
|
git reset --hard initial &&
|
|
git merge side -s ours &&
|
|
cat file | remove_cr | append_cr >file.temp &&
|
|
test_cmp file file.temp
|
|
'
|
|
|
|
test_expect_success 'Check that conflict file is CRLF' '
|
|
git reset --hard a &&
|
|
test_must_fail git merge side &&
|
|
cat file | remove_cr | append_cr >file.temp &&
|
|
test_cmp file file.temp
|
|
'
|
|
|
|
test_done
|