Skip to content

Commit 0b7f0ce

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 33e782e commit 0b7f0ce

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

t/t0095-bloom.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ test_expect_success 'compute bloom key for test string 2' '
7777
test_cmp expect actual
7878
'
7979

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

t/t2407-worktree-heads.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ test_expect_success 'refuse to overwrite: checked out in worktree' '
4949
done
5050
'
5151

52-
test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in bisect' '
52+
test_expect_success 'refuse to overwrite: worktree in bisect' '
5353
test_when_finished git -C wt-4 bisect reset &&
5454
5555
# 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' '
6161
grep "cannot force update the branch '\''wt-4'\'' used by worktree at.*wt-4" err
6262
'
6363

64-
test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (apply)' '
64+
test_expect_success 'refuse to overwrite: worktree in rebase (apply)' '
6565
test_when_finished git -C wt-2 rebase --abort &&
6666
6767
# 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
7171
grep "cannot force update the branch '\''wt-2'\'' used by worktree at.*wt-2" err
7272
'
7373

74-
test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (merge)' '
74+
test_expect_success 'refuse to overwrite: worktree in rebase (merge)' '
7575
test_when_finished git -C wt-2 rebase --abort &&
7676
7777
# 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
8181
grep "cannot force update the branch '\''wt-2'\'' used by worktree at.*wt-2" err
8282
'
8383

84-
test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase with --update-refs' '
84+
test_expect_success 'refuse to overwrite: worktree in rebase with --update-refs' '
8585
test_when_finished git -C wt-3 rebase --abort &&
8686
8787
git branch -f can-be-updated wt-3 &&
@@ -95,7 +95,7 @@ test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase with
9595
done
9696
'
9797

98-
test_expect_success !SANITIZE_LEAK 'refuse to fetch over ref: checked out' '
98+
test_expect_success 'refuse to fetch over ref: checked out' '
9999
test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
100100
grep "refusing to fetch into branch '\''refs/heads/wt-3'\''" err &&
101101
@@ -105,7 +105,7 @@ test_expect_success !SANITIZE_LEAK 'refuse to fetch over ref: checked out' '
105105
grep "refusing to fetch into branch" err
106106
'
107107

108-
test_expect_success !SANITIZE_LEAK 'refuse to fetch over ref: worktree in bisect' '
108+
test_expect_success 'refuse to fetch over ref: worktree in bisect' '
109109
test_when_finished git -C wt-4 bisect reset &&
110110
111111
# 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
117117
grep "refusing to fetch into branch" err
118118
'
119119

120-
test_expect_success !SANITIZE_LEAK 'refuse to fetch over ref: worktree in rebase' '
120+
test_expect_success 'refuse to fetch over ref: worktree in rebase' '
121121
test_when_finished git -C wt-3 rebase --abort &&
122122
123123
# This will fail part-way through due to a conflict.
@@ -157,7 +157,7 @@ test_expect_success 'refuse to overwrite when in error states' '
157157

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

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

t/t4020-diff-external.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ test_expect_success 'diff attribute' '
102102
test_cmp expect actual
103103
'
104104

105-
test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' '
105+
test_expect_success 'diff attribute should apply only to diff' '
106106
git log -p -1 HEAD >out &&
107107
grep "^diff --git a/file b/file" out
108108
@@ -129,7 +129,7 @@ test_expect_success 'diff attribute' '
129129
test_cmp expect actual
130130
'
131131

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

0 commit comments

Comments
 (0)