mirror of
https://github.com/git/git.git
synced 2024-06-01 21:46:10 +02:00
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>
105 lines
2.3 KiB
Bash
Executable File
105 lines
2.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='merge: handle file mode'
|
|
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 'set up mode change in one branch' '
|
|
: >file1 &&
|
|
git add file1 &&
|
|
git commit -m initial &&
|
|
git checkout -b a1 main &&
|
|
: >dummy &&
|
|
git add dummy &&
|
|
git commit -m a &&
|
|
git checkout -b b1 main &&
|
|
test_chmod +x file1 &&
|
|
git add file1 &&
|
|
git commit -m b1
|
|
'
|
|
|
|
do_one_mode () {
|
|
strategy=$1
|
|
us=$2
|
|
them=$3
|
|
test_expect_success "resolve single mode change ($strategy, $us)" '
|
|
git checkout -f $us &&
|
|
git merge -s $strategy $them &&
|
|
git ls-files -s file1 | grep ^100755
|
|
'
|
|
|
|
test_expect_success FILEMODE "verify executable bit on file ($strategy, $us)" '
|
|
test -x file1
|
|
'
|
|
}
|
|
|
|
do_one_mode recursive a1 b1
|
|
do_one_mode recursive b1 a1
|
|
do_one_mode resolve a1 b1
|
|
do_one_mode resolve b1 a1
|
|
|
|
test_expect_success 'set up mode change in both branches' '
|
|
git reset --hard HEAD &&
|
|
git checkout -b a2 main &&
|
|
: >file2 &&
|
|
H=$(git hash-object file2) &&
|
|
test_chmod +x file2 &&
|
|
git commit -m a2 &&
|
|
git checkout -b b2 main &&
|
|
: >file2 &&
|
|
git add file2 &&
|
|
git commit -m b2 &&
|
|
cat >expect <<-EOF
|
|
100755 $H 2 file2
|
|
100644 $H 3 file2
|
|
EOF
|
|
'
|
|
|
|
do_both_modes () {
|
|
strategy=$1
|
|
test_expect_success "detect conflict on double mode change ($strategy)" '
|
|
git reset --hard &&
|
|
git checkout -f a2 &&
|
|
test_must_fail git merge -s $strategy b2 &&
|
|
git ls-files -u >actual &&
|
|
test_cmp expect actual &&
|
|
git ls-files -s file2 | grep ^100755
|
|
'
|
|
|
|
test_expect_success FILEMODE "verify executable bit on file ($strategy)" '
|
|
test -x file2
|
|
'
|
|
}
|
|
|
|
# both sides are equivalent, so no need to run both ways
|
|
do_both_modes recursive
|
|
do_both_modes resolve
|
|
|
|
test_expect_success 'set up delete/modechange scenario' '
|
|
git reset --hard &&
|
|
git checkout -b deletion main &&
|
|
git rm file1 &&
|
|
git commit -m deletion
|
|
'
|
|
|
|
do_delete_modechange () {
|
|
strategy=$1
|
|
us=$2
|
|
them=$3
|
|
test_expect_success "detect delete/modechange conflict ($strategy, $us)" '
|
|
git reset --hard &&
|
|
git checkout $us &&
|
|
test_must_fail git merge -s $strategy $them
|
|
'
|
|
}
|
|
|
|
do_delete_modechange recursive b1 deletion
|
|
do_delete_modechange recursive deletion b1
|
|
do_delete_modechange resolve b1 deletion
|
|
do_delete_modechange resolve deletion b1
|
|
|
|
test_done
|