diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:46 -0800 |
| commit | 62329d336f5d427d8f08035798bf62cd7d8fd847 (patch) | |
| tree | 61fcf9bfd9c8a547c1b6dfae038217ae51829ee6 /t/test-lib.sh | |
| parent | 285907901c386eae4e0d50c617e1b82a58cff778 (diff) | |
| parent | 8c4cbad6a3a1dcfd881dce810111888d9cbe08da (diff) | |
| download | git-62329d336f5d427d8f08035798bf62cd7d8fd847.tar.gz | |
Merge branch 'ds/trace2-regions-in-tests'
The default setting for trace2 event nesting was too low to cause
test failures, which is worked around by bumping it up in the test
framework.
* ds/trace2-regions-in-tests:
t/t*: remove custom GIT_TRACE2_EVENT_NESTING
test-lib.sh: set GIT_TRACE2_EVENT_NESTING
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index b265c0a1fc..d1750bf615 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -476,6 +476,13 @@ export GIT_TEST_MERGE_ALGORITHM GIT_TRACE_BARE=1 export GIT_TRACE_BARE +# Some tests scan the GIT_TRACE2_EVENT feed for events, but the +# default depth is 2, which frequently causes issues when the +# events are wrapped in new regions. Set it to a sufficiently +# large depth to avoid custom changes in the test suite. +GIT_TRACE2_EVENT_NESTING=100 +export GIT_TRACE2_EVENT_NESTING + # Use specific version of the index file format if test -n "${GIT_TEST_INDEX_VERSION:+isset}" then |