grr
This commit is contained in:
parent
4ca5b98550
commit
9bc3d63ded
14
urchin
14
urchin
@ -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 "${exit_on_not_ok}"; then
|
||||||
if test -f teardown_dir; then
|
if test -f teardown_dir; then
|
||||||
. ./teardown_dir
|
. ./teardown_dir
|
||||||
fi
|
fi
|
||||||
return 1
|
return "${return_code}"
|
||||||
|
fi
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user