mirror of
https://github.com/git/git.git
synced 2024-12-14 12:23:35 +08: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>
131 lines
3.3 KiB
Bash
Executable File
131 lines
3.3 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Eric Wong
|
|
#
|
|
|
|
test_description='git apply should not get confused with type changes.
|
|
|
|
'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup repository and commits' '
|
|
echo "hello world" > foo &&
|
|
echo "hi planet" > bar &&
|
|
git update-index --add foo bar &&
|
|
git commit -m initial &&
|
|
git branch initial &&
|
|
rm -f foo &&
|
|
test_ln_s_add bar foo &&
|
|
git commit -m "foo symlinked to bar" &&
|
|
git branch foo-symlinked-to-bar &&
|
|
git rm -f foo &&
|
|
echo "how far is the sun?" > foo &&
|
|
git update-index --add foo &&
|
|
git commit -m "foo back to file" &&
|
|
git branch foo-back-to-file &&
|
|
printf "\0" > foo &&
|
|
git update-index foo &&
|
|
git commit -m "foo becomes binary" &&
|
|
git branch foo-becomes-binary &&
|
|
rm -f foo &&
|
|
git update-index --remove foo &&
|
|
mkdir foo &&
|
|
echo "if only I knew" > foo/baz &&
|
|
git update-index --add foo/baz &&
|
|
git commit -m "foo becomes a directory" &&
|
|
git branch "foo-becomes-a-directory" &&
|
|
echo "hello world" > foo/baz &&
|
|
git update-index foo/baz &&
|
|
git commit -m "foo/baz is the original foo" &&
|
|
git branch foo-baz-renamed-from-foo
|
|
'
|
|
|
|
test_expect_success 'file renamed from foo to foo/baz' '
|
|
git checkout -f initial &&
|
|
git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'file renamed from foo/baz to foo' '
|
|
git checkout -f foo-baz-renamed-from-foo &&
|
|
git diff-tree -M -p HEAD initial > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'directory becomes file' '
|
|
git checkout -f foo-becomes-a-directory &&
|
|
git diff-tree -p HEAD initial > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'file becomes directory' '
|
|
git checkout -f initial &&
|
|
git diff-tree -p HEAD foo-becomes-a-directory > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'file becomes symlink' '
|
|
git checkout -f initial &&
|
|
git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'symlink becomes file' '
|
|
git checkout -f foo-symlinked-to-bar &&
|
|
git diff-tree -p HEAD foo-back-to-file > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
test_expect_success 'symlink becomes file, in reverse' '
|
|
git checkout -f foo-symlinked-to-bar &&
|
|
git diff-tree -p HEAD foo-back-to-file > patch &&
|
|
git checkout foo-back-to-file &&
|
|
git apply -R --index < patch
|
|
'
|
|
|
|
test_expect_success 'binary file becomes symlink' '
|
|
git checkout -f foo-becomes-binary &&
|
|
git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
test_expect_success 'symlink becomes binary file' '
|
|
git checkout -f foo-symlinked-to-bar &&
|
|
git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'symlink becomes directory' '
|
|
git checkout -f foo-symlinked-to-bar &&
|
|
git diff-tree -p HEAD foo-becomes-a-directory > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'directory becomes symlink' '
|
|
git checkout -f foo-becomes-a-directory &&
|
|
git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_done
|