From 4a19f7d53d001077fc29dab3538a1dca48d7b78f Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Sat, 26 Oct 2024 04:32:46 +0200
Subject: [PATCH] ci: initialize state_x (tracking `set -x`)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31939>
---
 .gitlab-ci/setup-test-env.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/setup-test-env.sh b/.gitlab-ci/setup-test-env.sh
index dfce99ef3ea..7eb6059be68 100644
--- a/.gitlab-ci/setup-test-env.sh
+++ b/.gitlab-ci/setup-test-env.sh
@@ -5,15 +5,20 @@
 
 shopt -s expand_aliases
 
-function _x_off {
+function _x_store_state {
     if [[ "$-" == *"x"* ]]; then
       state_x=1
-      set +x
     else
       state_x=0
     fi
 }
+_x_store_state
+alias x_store_state='{ _x_store_state; } >/dev/null 2>/dev/null'
 
+function _x_off {
+    x_store_state
+    set +x
+}
 alias x_off='{ _x_off; } >/dev/null 2>/dev/null'
 
 # TODO: implement x_on !
@@ -102,6 +107,7 @@ function _uncollapsed_section_switch {
 }
 alias uncollapsed_section_switch="x_off; _uncollapsed_section_switch"
 
+export -f _x_store_state
 export -f _x_off
 export -f get_current_minsec
 export -f error