t/t*: remove custom GIT_TRACE2_EVENT_NESTING
The previous change modified GIT_TRACE2_EVENT_NESTING by default within test-lib.sh. These custom assignments throughout the test suite are no longer necessary. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Nov 29, 2021 at 13:47 UTC
8c4cbad6a3a1dcfd881dce810111888d9cbe08da
5 files changed
+5
-9
t/t1092-sparse-checkout-compatibility.sh
+3
-3
@@ -688,7 +688,7 @@ test_expect_success 'submodule handling' '
688
test_expect_success 'sparse-index is expanded and converted back' '
689
init_repos &&
690
691
- GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
691
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
692
git -C sparse-index -c core.fsmonitor="" reset --hard &&
693
test_region index convert_to_sparse trace2.txt &&
694
test_region index ensure_full_index trace2.txt
@@ -702,10 +702,10 @@ ensure_not_expanded () {
702
then
703
shift &&
704
test_must_fail env \
705
- GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
705
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
706
git -C sparse-index "$@" || return 1
707
else
708
- GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
708
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
709
git -C sparse-index "$@" || return 1
710
fi &&
711
test_region ! index ensure_full_index trace2.txt
t/t4216-log-bloom.sh
-2
@@ -175,13 +175,11 @@ test_expect_success 'persist filter settings' '
175
test_when_finished rm -rf .git/objects/info/commit-graph* &&
176
rm -rf .git/objects/info/commit-graph* &&
177
GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
178
- GIT_TRACE2_EVENT_NESTING=5 \
178
GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=9 \
179
GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY=15 \
180
git commit-graph write --reachable --changed-paths &&
181
grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2.txt &&
182
GIT_TRACE2_EVENT="$(pwd)/trace2-auto.txt" \
184
- GIT_TRACE2_EVENT_NESTING=5 \
183
git commit-graph write --reachable --changed-paths &&
184
grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2-auto.txt
185
'
t/t5310-pack-bitmaps.sh
+1
-1
@@ -35,7 +35,7 @@ test_expect_success 'setup writing bitmaps during repack' '
35
'
36
37
test_expect_success 'full repack creates bitmaps' '
38
- GIT_TRACE2_EVENT_NESTING=4 GIT_TRACE2_EVENT="$(pwd)/trace" \
38
+ GIT_TRACE2_EVENT="$(pwd)/trace" \
39
git repack -ad &&
40
ls .git/objects/pack/ | grep bitmap >output &&
41
test_line_count = 1 output &&
t/t5705-session-id-in-capabilities.sh
-2
@@ -32,7 +32,6 @@ do
32
test_when_finished "git -C local push --delete origin new-branch" &&
33
cp -r "$LOCAL_PRISTINE" local &&
34
git -C local pull --no-rebase origin &&
35
- GIT_TRACE2_EVENT_NESTING=5 \
35
GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
36
git -c protocol.version=$PROTO -C local push \
37
--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
@@ -65,7 +64,6 @@ do
64
test_when_finished "git -C local push --delete origin new-branch" &&
65
cp -r "$LOCAL_PRISTINE" local &&
66
git -C local pull --no-rebase origin &&
68
- GIT_TRACE2_EVENT_NESTING=5 \
67
GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
68
git -c protocol.version=$PROTO -C local push \
69
--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
t/t7519-status-fsmonitor.sh
+1
-1
@@ -390,7 +390,7 @@ test_expect_success 'status succeeds after staging/unstaging' '
390
# during a call to 'git status'. Otherwise, we verify that we _do_ call it.
391
check_sparse_index_behavior () {
392
git -C full status --porcelain=v2 >expect &&
393
- GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
393
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
394
git -C sparse status --porcelain=v2 >actual &&
395
test_region $1 index ensure_full_index trace2.txt &&
396
test_region fsm_hook query trace2.txt &&