[PATCH v3 0/2] ci: link failure and leak annotations to the test script
- From
Harald Nordgren via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Sep 30, 2026, 06:09 UTC
- Message-ID
- <pull.2419.v3.git.git.1790748583.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.2419.git.git.1790362443893.gitgitgadget@gmail.com>
Link failure and leak annotations in CI to the test script, so both can be found from the job summary.
V3 CI Job where failures and leaks are reported: https://github.com/git/git/actions/runs/36537917146/job/109306215909?pr=2426
Changes in v3:
* Fixed bug in the --immediate exit ordering: the --immediate && --invert-exit-code path called exit 0 before the test's annotation was written, now a single unconditional call covers both exit paths. * github_escape_message_ no longer relies on \r being a portable sed escape sequence (not POSIX-guaranteed and BSD sed implementations can differ), it splices in the literal carriage-return byte via printf instead. * Reverted unrelated test-tool line back to its original form.
Changes in v2:
* Split into two commits, each explaining its own reasoning. * Leak output is no longer capped or embedded in the message, it's now an uncapped fold, so multiple leaks in the same test both show in full. A second leak in a different test still won't show in the same run, --immediate stops the script at the first failure, but it no longer gets buried under every later test falsely reporting "not ok" either. * Drops the giant unfolded message that annotations used to carry, which is what probably caused the scrolling behavior.
Harald Nordgren (2):
ci: annotate leaks and stop a leak-sanitizer script at its first
failure
ci: point test failures and fixed known breakages at their file and
lineci/lib.sh | 1 + t/test-lib-github-workflow-markup.sh | 54 ++++++++++++++++++++++++---- t/test-lib.sh | 6 +++- 3 files changed, 54 insertions(+), 7 deletions(-)
base-commit: a018953688f1b10bddf91bff8747068f5f4746a4 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2419%2FHaraldNordgren%2Fci-annotation-file-line-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2419/HaraldNordgren/ci-annotation-file-line-v3 Pull-Request: https://github.com/git/git/pull/2419
Range-diff vs v2:
1: 46e13a6e77 ! 1: b6a36820ae ci: annotate leaks and stop a leak-sanitizer script at its first failure
@@ t/test-lib.sh: test_failure_ () {
say_color error "not ok $test_count - ${pfx:+$pfx }$1"
shift
printf '%s\n' "$*" | sed -e 's/^/# /'
-+ if test -n "$immediate" && test -n "$invert_exit_code"
-+ then
-+ say_color error "1..$test_count"
-+ finalize_test_output
-+ _invert_exit_code_failure_end_blurb
-+ GIT_EXIT_OK=t
-+ exit 0
-+ fi
-+ # Write the annotation before the --immediate exit paths below,
-+ # which call exit and would otherwise skip it.
++ # Write the annotation before either --immediate exit path below,
++ # both of which call exit and would otherwise skip it.
+ finalize_test_case_output failure "$failure_label" "$@"
if test -n "$immediate"
then
say_color error "1..$test_count"
-- if test -n "$invert_exit_code"
-- then
-- finalize_test_output
-- _invert_exit_code_failure_end_blurb
-- GIT_EXIT_OK=t
-- exit 0
-- fi
+@@ t/test-lib.sh: test_failure_ () {
check_test_results_san_file_ "$test_failure"
_error_exit
fi
2: bffa8fb030 ! 2: 750c360512 ci: point test failures and fixed known breakages at their file and line
@@ t/test-lib-github-workflow-markup.sh: start_test_output () {
+github_escape_message_ () {
+ # A test description is always one line, so only % and CR need
+ # escaping here. Escape % first, or CR's own %-encoding gets mangled.
-+ sed -e 's/%/%25/g' -e 's/\r/%0D/g'
++ # \r is not a portable sed escape, so splice in the actual byte.
++ sed -e 's/%/%25/g' -e "s/$(printf '\r')/%0D/g"
+}
+
+find_test_case_line_ () {
@@ t/test-lib-github-workflow-markup.sh: github_annotation_ () {
esac
+
echo >>$github_markup_output "::group::$test_case_result: $this_test.$test_count $*"
-- test-tool >>$github_markup_output path-utils skip-n-bytes \
-- "$GIT_TEST_TEE_OUTPUT_FILE" $GIT_TEST_TEE_OFFSET
-+ test-tool path-utils skip-n-bytes \
-+ "$GIT_TEST_TEE_OUTPUT_FILE" $GIT_TEST_TEE_OFFSET >>$github_markup_output
- echo >>$github_markup_output "::endgroup::"
- }
-
+ test-tool >>$github_markup_output path-utils skip-n-bytes \
+ "$GIT_TEST_TEE_OUTPUT_FILE" $GIT_TEST_TEE_OFFSET-- gitgitgadget