From 8d2620569c470c32b24ed043400faae681d9cccd Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 8 Nov 2024 10:08:35 +0100
Subject: [PATCH] ci: make error handling quieter

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32054>
---
 .gitlab-ci/setup-test-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci/setup-test-env.sh b/.gitlab-ci/setup-test-env.sh
index dff17361479..cb89922e6a4 100644
--- a/.gitlab-ci/setup-test-env.sh
+++ b/.gitlab-ci/setup-test-env.sh
@@ -119,7 +119,6 @@ if [ -z "${RESULTS_DIR:-}" ]; then
 fi
 
 function error {
-    x_off 2>/dev/null
     RED="\e[0;31m"
     ENDCOLOR="\e[0m"
     # we force the following to be not in a section
@@ -134,6 +133,7 @@ function error {
 }
 
 function trap_err {
+    x_off
     error ${CURRENT_SECTION:-'unknown-section'}: ret code: $*
 }