refactored test

This commit is contained in:
pvincent
2026-07-18 14:18:55 +04:00
parent 089553cf3a
commit c846767bc8
3 changed files with 30 additions and 22 deletions
+9 -18
View File
@@ -29,18 +29,8 @@ function exit {
}
function on_usr1 {
last_error=$(tail -n1 "$MIAOU_BASH_ERROR")
cleanup
regex='subshell term: ([0-9]*)'
if [[ "$last_error" =~ $regex ]]; then
code="${BASH_REMATCH[1]}"
debug "on_usr1 code=${code}"
builtin exit "${code}"
else
debug "on_usr1 unknown last error: $last_error"
builtin exit 200
fi
# >&2 echo "${BASH_SOURCE[2]}: line ${BASH_LINENO[0]}: subshell termination $code from ${FUNCNAME[1]}"
builtin exit 1
}
function on_return {
@@ -89,17 +79,21 @@ function on_exit {
failure_payload=''
if [[ $code -gt 0 ]]; then
last_error=$(tail -n1 "$MIAOU_BASH_ERROR")
last_source=${stack_sources[0]}
last_source=${last_source//./"\."} # replace '.' with '\.'
regex1="^$last_source: line ([0-9]+): (.*)\$"
regex2="^$last_source:([0-9]+) (.*)\$"
# FIXME: too much tricky
# FIXME: too much tricky! (delayed stderr)
if [[ -p /dev/stdout ]]; then
last_error="subshell term: $code"
>&2 echo "$last_error"
failure_type='SUBSHELL TERM'
failure_payload="$last_error"
last_error="${BASH_SOURCE[1]}:${BASH_LINENO[0]} subshell term $code"
kill -USR1 $$
else
failure_type='UNKNOWN'
fi
# debug "last_error=[$last_error] <=> ${last_source}"
@@ -159,9 +153,6 @@ function on_exit {
failure_type='UNKNOWN NOT FOUND'
fi
fi
else
failure_type='UNKNOWN'
failure_payload="${message}"
fi
fi
fi
@@ -169,7 +160,7 @@ function on_exit {
fi
fi
else
failure_type='UNDEFINED'
# failure_type='UNDEFINED'
debug "last error=${last_error}"
failure_payload="${last_error}"
regex="^ .*:[0-9]* .*\$"