From 8e27803cea370a18f3a9ff8f31e9b5e4eccc8460 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Fri, 6 Jun 2025 10:35:16 -0600 Subject: [PATCH] Fix conformance labeling on CI, no tty (#12450) Signed-off-by: Derek Nola --- tests/docker/test-helpers | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/docker/test-helpers b/tests/docker/test-helpers index 12d24047099..08cb1ad95a6 100755 --- a/tests/docker/test-helpers +++ b/tests/docker/test-helpers @@ -534,15 +534,22 @@ run-go-test() { ) if [ "$LABEL" ]; then + # Save original stdout and stderr + exec 3>&1 + exec 4>&2 + exec > >(awk "{ printf \"[\033[36m${LABEL}\033[m] %s\n\", \$0; fflush() }") \ 2> >(awk "{ printf \"[\033[35m${LABEL}\033[m] %s\n\", \$0; fflush() }" >&2) fi go test -timeout=45m -v "$@" & - # Reset LABEL - unset "LABEL" - exec >/dev/tty 2>/dev/tty + if [ "$LABEL" ]; then + # Reset LABEL and restore stdout and stderr + unset "LABEL" + exec 1>&3 2>&4 + exec 3>&- 4>&- + fi pids+=($!) }