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

grr

This commit is contained in:
Thomas Levine 2016-04-10 20:45:01 +00:00
parent 4ca5b98550
commit 9bc3d63ded
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
urchin
View File

@ -478,16 +478,17 @@ recurse() {
break break
fi fi
recurse "${requested_path}" "${test}" "${cycle_shell}" \ recurse "${requested_path}" "${test}" "${TEST_SHELL}" &
"${TEST_SHELL}" &
if "${run_in_series}" || "${run_in_series_dir}"; then if "${run_in_series}" || "${run_in_series_dir}"; then
if wait "${!}"; then exit_code=0; else exit_code="${?}"; fi if ! wait "${!}"; then
if "${exit_on_not_ok}" && test "${exit_code}" -ne 0; then return_code="$?"
if test -f teardown_dir; then if "${exit_on_not_ok}"; then
. ./teardown_dir if test -f teardown_dir; then
. ./teardown_dir
fi
return "${return_code}"
fi fi
return 1
fi fi
fi fi
done done
@ -498,9 +499,6 @@ recurse() {
) )
elif [ -f "${potential_test}" ]; then elif [ -f "${potential_test}" ]; then
cd -- "$(dirname -- "${potential_test}")" cd -- "$(dirname -- "${potential_test}")"
# Determine the environment variable to define for test scripts
# that reflects the specified or implied shell to use for shell-code tests.
echo "${shell_list}" | while read the_test_shell; do echo "${shell_list}" | while read the_test_shell; do
( (
if test -f setup; then if test -f setup; then