mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 04:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci: consistently restore -x after temporarily disabling it

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31939>
This commit is contained in:
Eric Engestrom 2024-10-28 13:46:09 +01:00 committed by Marge Bot
parent 4a19f7d53d
commit d69bd58365
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci/setup-test-env.sh
View File

@ -21,7 +21,10 @@ function _x_off {
} }
alias x_off='{ _x_off; } >/dev/null 2>/dev/null' alias x_off='{ _x_off; } >/dev/null 2>/dev/null'
# TODO: implement x_on ! function _x_restore {
[ $state_x -eq 0 ] || set -x
}
alias x_restore='{ _x_restore; } >/dev/null 2>/dev/null'
export JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}") export JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
@ -42,7 +45,7 @@ function error {
CURR_MINSEC=$(get_current_minsec) CURR_MINSEC=$(get_current_minsec)
echo -e "\n${RED}[${CURR_MINSEC}] ERROR: $*${ENDCOLOR}\n" echo -e "\n${RED}[${CURR_MINSEC}] ERROR: $*${ENDCOLOR}\n"
[ "$state_x" -eq 0 ] || set -x x_restore
} }
function trap_err { function trap_err {
@ -60,30 +63,32 @@ function _build_section_start {
CURR_MINSEC=$(get_current_minsec) CURR_MINSEC=$(get_current_minsec)
echo -e "\n\e[0Ksection_start:$(date +%s):$section_name$section_params\r\e[0K${CYAN}[${CURR_MINSEC}] $*${ENDCOLOR}\n" echo -e "\n\e[0Ksection_start:$(date +%s):$section_name$section_params\r\e[0K${CYAN}[${CURR_MINSEC}] $*${ENDCOLOR}\n"
x_restore
} }
alias build_section_start="x_off; _build_section_start" alias build_section_start="x_off; _build_section_start"
function _section_start { function _section_start {
_build_section_start "[collapsed=true]" $* _build_section_start "[collapsed=true]" $*
[ "$state_x" -eq 0 ] || set -x x_restore
} }
alias section_start="x_off; _section_start" alias section_start="x_off; _section_start"
function _uncollapsed_section_start { function _uncollapsed_section_start {
_build_section_start "" $* _build_section_start "" $*
[ "$state_x" -eq 0 ] || set -x x_restore
} }
alias uncollapsed_section_start="x_off; _uncollapsed_section_start" alias uncollapsed_section_start="x_off; _uncollapsed_section_start"
function _build_section_end { function _build_section_end {
echo -e "\e[0Ksection_end:$(date +%s):$1\r\e[0K" echo -e "\e[0Ksection_end:$(date +%s):$1\r\e[0K"
CURRENT_SECTION="" CURRENT_SECTION=""
x_restore
} }
alias build_section_end="x_off; _build_section_end" alias build_section_end="x_off; _build_section_end"
function _section_end { function _section_end {
_build_section_end $* _build_section_end $*
[ "$state_x" -eq 0 ] || set -x x_restore
} }
alias section_end="x_off; _section_end" alias section_end="x_off; _section_end"
@ -93,7 +98,7 @@ function _section_switch {
_build_section_end $CURRENT_SECTION _build_section_end $CURRENT_SECTION
fi fi
_build_section_start "[collapsed=true]" $* _build_section_start "[collapsed=true]" $*
[ "$state_x" -eq 0 ] || set -x x_restore
} }
alias section_switch="x_off; _section_switch" alias section_switch="x_off; _section_switch"
@ -103,12 +108,13 @@ function _uncollapsed_section_switch {
_build_section_end $CURRENT_SECTION _build_section_end $CURRENT_SECTION
fi fi
_build_section_start "" $* _build_section_start "" $*
[ "$state_x" -eq 0 ] || set -x x_restore
} }
alias uncollapsed_section_switch="x_off; _uncollapsed_section_switch" alias uncollapsed_section_switch="x_off; _uncollapsed_section_switch"
export -f _x_store_state export -f _x_store_state
export -f _x_off export -f _x_off
export -f _x_restore
export -f get_current_minsec export -f get_current_minsec
export -f error export -f error
export -f trap_err export -f trap_err