tlevine
/
urchin
1
0
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

meta

This commit is contained in:
Thomas Levine 2016-04-10 22:48:55 +00:00
parent 1bf8b930ec
commit c8a0a1b30e
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
urchin
View File

@ -493,21 +493,24 @@ recurse() {
"${run_in_series_root}"; then "${run_in_series_root}"; then
return_code=$(catch wait "${!}") return_code=$(catch wait "${!}")
if "${return_on_not_ok}" && test "${exit_code}" -ne 0; then if "${return_on_not_ok}" && test "${exit_code}" -ne 0; then
if test -f teardown_dir; then eval "$(dot_if_exists teardown_dir)"
. ./teardown_dir
fi
return $return_code return $return_code
fi fi
fi fi
' '
dot_if_exists() {
echo "
if test -f ${1}; then
. ./${1}
fi
"
}
if [ -d "${abs_current}" ]; then if [ -d "${abs_current}" ]; then
( (
cd -- "${abs_current}" cd -- "${abs_current}"
if test -f setup_dir; then eval "$(dot_if_exists setup_dir)"
. ./setup_dir
fi
for test in *; do for test in *; do
if test "${test}" = '*' && ! test -e "${test}"; then if test "${test}" = '*' && ! test -e "${test}"; then
@ -520,17 +523,13 @@ recurse() {
done done
wait wait
if test -f teardown_dir; then eval "$(dot_if_exists teardown_dir)"
. ./teardown_dir
fi
) )
elif [ -f "${abs_current}" ]; then elif [ -f "${abs_current}" ]; then
cd -- "$(dirname -- "${abs_current}")" cd -- "$(dirname -- "${abs_current}")"
echo "${shell_list}" | while read -r sh; do echo "${shell_list}" | while read -r sh; do
( (
if test -f setup; then eval "$(dot_if_exists setup)"
. ./setup
fi
out_file="$(stdout_file "${tmp_dir}" "${rel_current}" "${sh}")" out_file="$(stdout_file "${tmp_dir}" "${rel_current}" "${sh}")"
@ -548,9 +547,7 @@ recurse() {
finish=$("${epoch}") finish=$("${epoch}")
elapsed=$(($finish - $start)) elapsed=$(($finish - $start))
if test -f teardown; then eval "$(dot_if_exists teardown)"
. ./teardown
fi
case "${exit_code}" in case "${exit_code}" in
0) result=ok ;; 0) result=ok ;;