All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  Ben Knoble <ben.knoble@gmail.com>,
	 Phillip Wood <phillip.wood123@gmail.com>,
	 Harald Nordgren <haraldnordgren@gmail.com>
Subject: Re: [PATCH v2 2/2] ci: point test failures and fixed known breakages at their file and line
Date: Mon, 28 Sep 2026 13:53:28 -0700	[thread overview]
Message-ID: <xmqqpkxxkshj.fsf@gitster.g> (raw)
In-Reply-To: <bffa8fb0309b3698bebaa9b4d4763acdea52a7a2.1790621693.git.gitgitgadget@gmail.com> (Harald Nordgren via GitGitGadget's message of "Mon, 28 Sep 2026 18:54:53 +0000")

"Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com> writes:

>  t/test-lib-github-workflow-markup.sh | 41 ++++++++++++++++++++++------
>  1 file changed, 33 insertions(+), 8 deletions(-)
>
> diff --git a/t/test-lib-github-workflow-markup.sh b/t/test-lib-github-workflow-markup.sh
> index 0d54496358..67c5c3461c 100644
> --- a/t/test-lib-github-workflow-markup.sh
> +++ b/t/test-lib-github-workflow-markup.sh
> @@ -31,6 +31,21 @@ start_test_output () {
>  	github_markup_script_name=${0##*/}
>  }
>  
> +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'
> +}

Is it portable to feed a two-letter sequence "\r" to "sed" and
expect it to be interpreted as Carriage Return?  Implementations of
BSD lineage "sed" don't grok it if I recall correctly.

> +find_test_case_line_ () {
> +	# A description can contain characters like [ or * that would
> +	# corrupt a regex search, so match it literally and take the first
> +	# hit; -- keeps a description starting with "-" from being read as
> +	# an option.
> +	grep -n -F -- "$1" "$TEST_DIRECTORY/$github_markup_script_name" |
> +	head -n 1 | cut -d: -f1
> +}
> +
>  github_annotation_ () {
>  	echo >>$github_markup_output "::$1 file=$2,line=$3::$4"
>  }
> @@ -40,21 +55,31 @@ github_annotation_ () {
>  finalize_test_case_output () {
>  	test_case_result=$1
>  	shift
> +
> +	case "$test_case_result" in
> +	ok|broken)
> +		# Exit without printing the "ok" or "broken" tests
> +		return
> +		;;
> +	esac
> +
> +	test_case_line=$(find_test_case_line_ "$1")
> +	test_case_description=$(printf '%s' "$1" | github_escape_message_)
> +
>  	case "$test_case_result" in
>  	failure)
> -		echo >>$github_markup_output "::error::failed: $this_test.$test_count $1"
> +		github_annotation_ error "t/$github_markup_script_name" "${test_case_line:-1}" \
> +			"failed: $this_test.$test_count $test_case_description"
>  		;;
>  	fixed)
> -		echo >>$github_markup_output "::notice::fixed: $this_test.$test_count $1"
> -		;;
> -	ok|broken)
> -		# Exit without printing the "ok" or ""broken" tests
> -		return
> +		github_annotation_ notice "t/$github_markup_script_name" "${test_case_line:-1}" \
> +			"fixed: $this_test.$test_count $test_case_description"
>  		;;
>  	esac
> +

All of the above may make sense, but ...

>  	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::"

What is this change about?  In the original, all surrounding code
has redirection early on the command line, and breaking that pattern
is the only difference between the removed and added lines here as
far as I can see.

>  }

  reply	other threads:[~2026-09-28 20:53 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-25 18:54 [PATCH] ci: point leak-sanitizer failures at the actual test and error Harald Nordgren via GitGitGadget
2026-09-25 20:26 ` Ben Knoble
2026-09-25 21:43   ` Harald Nordgren
2026-09-27 15:19 ` Phillip Wood
2026-09-27 19:52   ` Harald Nordgren
2026-09-28 18:54 ` [PATCH v2 0/2] ci: link failure and leak annotations to the test script Harald Nordgren via GitGitGadget
2026-09-28 18:54   ` [PATCH v2 1/2] ci: annotate leaks and stop a leak-sanitizer script at its first failure Harald Nordgren via GitGitGadget
2026-09-28 20:46     ` Junio C Hamano
2026-09-29  7:47       ` Harald Nordgren
2026-09-28 18:54   ` [PATCH v2 2/2] ci: point test failures and fixed known breakages at their file and line Harald Nordgren via GitGitGadget
2026-09-28 20:53     ` Junio C Hamano [this message]
2026-09-30  6:09 ` [PATCH v3 0/2] ci: link failure and leak annotations to the test script Harald Nordgren via GitGitGadget
2026-09-30  6:09   ` [PATCH v3 1/2] ci: annotate leaks and stop a leak-sanitizer script at its first failure Harald Nordgren via GitGitGadget
2026-09-30 14:56     ` Phillip Wood
2026-09-30  6:09   ` [PATCH v3 2/2] ci: point test failures and fixed known breakages at their file and line Harald Nordgren via GitGitGadget
2026-09-30 14:56     ` Phillip Wood
2026-09-30 18:40       ` Harald Nordgren
2026-09-30 14:37   ` [PATCH v3 0/2] ci: link failure and leak annotations to the test script Junio C Hamano
2026-09-30 15:52     ` Phillip Wood
2026-09-30 18:46       ` Junio C Hamano
2026-10-01 18:44 ` [PATCH v4 " Harald Nordgren via GitGitGadget
2026-10-01 18:44   ` [PATCH v4 1/2] ci: annotate leaks and stop a leak-sanitizer script at its first failure Harald Nordgren via GitGitGadget
2026-10-01 18:44   ` [PATCH v4 2/2] ci: point test failures and fixed known breakages at their file and line Harald Nordgren via GitGitGadget
2026-10-01 19:49     ` Phillip Wood
2026-10-01 20:11       ` Junio C Hamano
2026-10-02  8:04       ` Harald Nordgren
2026-10-03  8:11 ` [PATCH v5 0/2] ci: link failure and leak annotations to the test script Harald Nordgren via GitGitGadget
2026-10-03  8:11   ` [PATCH v5 1/2] ci: annotate leaks and stop a leak-sanitizer script at its first failure Harald Nordgren via GitGitGadget
2026-10-03  8:11   ` [PATCH v5 2/2] ci: point test failures and fixed known breakages at their file and line Harald Nordgren via GitGitGadget
2026-10-03 13:03   ` [PATCH v5 0/2] ci: link failure and leak annotations to the test script Phillip Wood
2026-10-03 19:02     ` Phillip Wood
2026-10-04 11:51       ` Harald Nordgren
2026-10-05 13:23         ` Phillip Wood
2026-10-05 13:59           ` Harald Nordgren
2026-10-05 15:11             ` Phillip Wood
2026-10-04 12:03     ` Harald Nordgren
2026-10-06  6:56 ` [PATCH v6 " Harald Nordgren via GitGitGadget
2026-10-06  6:56   ` [PATCH v6 1/2] ci: annotate leaks and stop a leak-sanitizer script at its first failure Harald Nordgren via GitGitGadget
2026-10-06  6:56   ` [PATCH v6 2/2] ci: point test failures and fixed known breakages at their file and line Harald Nordgren via GitGitGadget
2026-10-06  9:52   ` [PATCH v6 0/2] ci: link failure and leak annotations to the test script Phillip Wood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqpkxxkshj.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=ben.knoble@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=haraldnordgren@gmail.com \
    --cc=phillip.wood123@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.