kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t: remove unneeded !SANITIZE_LEAK prerequisites 

We have a couple of !SANITIZE_LEAK prerequisites for tests that used to
fail due to memory leaks. These have all been fixed by now, so let's
drop the prerequisite.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2024-11-20 14:39:54 +01:00 committed by Junio C Hamano
parent 33e782e959
commit 0b7f0ce751
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t0095-bloom.sh
View File

@ -77,7 +77,7 @@ test_expect_success 'compute bloom key for test string 2' '
test_cmp expect actual test_cmp expect actual
' '


test_expect_success !SANITIZE_LEAK 'get bloom filters for commit with no changes' ' test_expect_success 'get bloom filters for commit with no changes' '
git init && git init &&
git commit --allow-empty -m "c0" && git commit --allow-empty -m "c0" &&
cat >expect <<-\EOF && cat >expect <<-\EOF &&

16
t/t2407-worktree-heads.sh
View File

@ -49,7 +49,7 @@ test_expect_success 'refuse to overwrite: checked out in worktree' '
done done
' '


test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in bisect' ' test_expect_success 'refuse to overwrite: worktree in bisect' '
test_when_finished git -C wt-4 bisect reset && test_when_finished git -C wt-4 bisect reset &&


# Set up a bisect so HEAD no longer points to wt-4. # Set up a bisect so HEAD no longer points to wt-4.
@ -61,7 +61,7 @@ test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in bisect' '
grep "cannot force update the branch '\''wt-4'\'' used by worktree at.*wt-4" err grep "cannot force update the branch '\''wt-4'\'' used by worktree at.*wt-4" err
' '


test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (apply)' ' test_expect_success 'refuse to overwrite: worktree in rebase (apply)' '
test_when_finished git -C wt-2 rebase --abort && test_when_finished git -C wt-2 rebase --abort &&


# This will fail part-way through due to a conflict. # This will fail part-way through due to a conflict.
@ -71,7 +71,7 @@ test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (app
grep "cannot force update the branch '\''wt-2'\'' used by worktree at.*wt-2" err grep "cannot force update the branch '\''wt-2'\'' used by worktree at.*wt-2" err
' '


test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (merge)' ' test_expect_success 'refuse to overwrite: worktree in rebase (merge)' '
test_when_finished git -C wt-2 rebase --abort && test_when_finished git -C wt-2 rebase --abort &&


# This will fail part-way through due to a conflict. # This will fail part-way through due to a conflict.
@ -81,7 +81,7 @@ test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (mer
grep "cannot force update the branch '\''wt-2'\'' used by worktree at.*wt-2" err grep "cannot force update the branch '\''wt-2'\'' used by worktree at.*wt-2" err
' '


test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase with --update-refs' ' test_expect_success 'refuse to overwrite: worktree in rebase with --update-refs' '
test_when_finished git -C wt-3 rebase --abort && test_when_finished git -C wt-3 rebase --abort &&


git branch -f can-be-updated wt-3 && git branch -f can-be-updated wt-3 &&
@ -95,7 +95,7 @@ test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase with
done done
' '


test_expect_success !SANITIZE_LEAK 'refuse to fetch over ref: checked out' ' test_expect_success 'refuse to fetch over ref: checked out' '
test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err && test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
grep "refusing to fetch into branch '\''refs/heads/wt-3'\''" err && grep "refusing to fetch into branch '\''refs/heads/wt-3'\''" err &&


@ -105,7 +105,7 @@ test_expect_success !SANITIZE_LEAK 'refuse to fetch over ref: checked out' '
grep "refusing to fetch into branch" err grep "refusing to fetch into branch" err
' '


test_expect_success !SANITIZE_LEAK 'refuse to fetch over ref: worktree in bisect' ' test_expect_success 'refuse to fetch over ref: worktree in bisect' '
test_when_finished git -C wt-4 bisect reset && test_when_finished git -C wt-4 bisect reset &&


# Set up a bisect so HEAD no longer points to wt-4. # Set up a bisect so HEAD no longer points to wt-4.
@ -117,7 +117,7 @@ test_expect_success !SANITIZE_LEAK 'refuse to fetch over ref: worktree in bisect
grep "refusing to fetch into branch" err grep "refusing to fetch into branch" err
' '


test_expect_success !SANITIZE_LEAK 'refuse to fetch over ref: worktree in rebase' ' test_expect_success 'refuse to fetch over ref: worktree in rebase' '
test_when_finished git -C wt-3 rebase --abort && test_when_finished git -C wt-3 rebase --abort &&


# This will fail part-way through due to a conflict. # This will fail part-way through due to a conflict.
@ -157,7 +157,7 @@ test_expect_success 'refuse to overwrite when in error states' '


. "$TEST_DIRECTORY"/lib-rebase.sh . "$TEST_DIRECTORY"/lib-rebase.sh


test_expect_success !SANITIZE_LEAK 'refuse to overwrite during rebase with --update-refs' ' test_expect_success 'refuse to overwrite during rebase with --update-refs' '
git commit --fixup HEAD~2 --allow-empty && git commit --fixup HEAD~2 --allow-empty &&
( (
set_cat_todo_editor && set_cat_todo_editor &&

4
t/t4020-diff-external.sh
View File

@ -102,7 +102,7 @@ test_expect_success 'diff attribute' '
test_cmp expect actual test_cmp expect actual
' '


test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' ' test_expect_success 'diff attribute should apply only to diff' '
git log -p -1 HEAD >out && git log -p -1 HEAD >out &&
grep "^diff --git a/file b/file" out grep "^diff --git a/file b/file" out


@ -129,7 +129,7 @@ test_expect_success 'diff attribute' '
test_cmp expect actual test_cmp expect actual
' '


test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' ' test_expect_success 'diff attribute should apply only to diff' '
git log -p -1 HEAD >out && git log -p -1 HEAD >out &&
grep "^diff --git a/file b/file" out grep "^diff --git a/file b/file" out