names
This commit is contained in:
parent
9932d0bf6f
commit
ba20619102
26
urchin
26
urchin
@ -471,15 +471,15 @@ recurse() {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
if contains "${rel_current}" "${HT}"; then
|
if contains "${abs_current}" "${HT}"; then
|
||||||
echo "${shell_list}" | while read -r sh; do
|
echo "${shell_list}" | while read -r sh; do
|
||||||
no_tab="$(echo "${rel_current}" | tr '\t' ' ')"
|
no_tab="$(echo "${rel_current}" | tr '\t' ' ')"
|
||||||
log "${remote}" "${sh}" "${no_tab}" tab '' >> "${urchin_tmp}"/log
|
log "${remote}" "${sh}" "${no_tab}" tab '' >> "${urchin_tmp}"/log
|
||||||
done
|
done
|
||||||
elif [ -x "${rel_current}" ]; then
|
elif [ -x "${abs_current}" ]; then
|
||||||
if [ -d "${rel_current}" ]; then
|
if [ -d "${abs_current}" ]; then
|
||||||
(
|
(
|
||||||
cd -- "${rel_current}"
|
cd -- "${abs_current}"
|
||||||
if test -f .urchin_dir && grep series .urchin_dir > /dev/null; then
|
if test -f .urchin_dir && grep series .urchin_dir > /dev/null; then
|
||||||
run_in_series_dir=true
|
run_in_series_dir=true
|
||||||
else
|
else
|
||||||
@ -515,26 +515,26 @@ recurse() {
|
|||||||
. ./teardown_dir
|
. ./teardown_dir
|
||||||
fi
|
fi
|
||||||
)
|
)
|
||||||
elif [ -f "${rel_current}" ]; then
|
elif [ -f "${abs_current}" ]; then
|
||||||
cd -- "$(dirname -- "${rel_current}")"
|
cd -- "$(dirname -- "${abs_current}")"
|
||||||
echo "${shell_list}" | while read -r the_test_shell; do
|
echo "${shell_list}" | while read -r sh; do
|
||||||
(
|
(
|
||||||
if test -f setup; then
|
if test -f setup; then
|
||||||
. ./setup
|
. ./setup
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run with a shell?
|
# Run with a shell?
|
||||||
if has_shebang_line "${rel_current}"; then
|
if has_shebang_line "${abs_current}"; then
|
||||||
set -- "${rel_current}"
|
set -- "${abs_current}"
|
||||||
else
|
else
|
||||||
set -- "${the_test_shell}" "${rel_current}"
|
set -- "${sh}" "${abs_current}"
|
||||||
fi
|
fi
|
||||||
out_file="$(stdout_file "${tmp_dir}" "${rel_current}" "${the_test_shell}")"
|
out_file="$(stdout_file "${tmp_dir}" "${rel_current}" "${sh}")"
|
||||||
|
|
||||||
# Run the test
|
# Run the test
|
||||||
start=$("${epoch}")
|
start=$("${epoch}")
|
||||||
set +e
|
set +e
|
||||||
TEST_SHELL="${the_test_shell}" $TIMEOUT "$@" > "${out_file}" 2>&1
|
TEST_SHELL="${sh}" $TIMEOUT "$@" > "${out_file}" 2>&1
|
||||||
exit_code="${?}"
|
exit_code="${?}"
|
||||||
set -e
|
set -e
|
||||||
finish=$("${epoch}")
|
finish=$("${epoch}")
|
||||||
@ -551,7 +551,7 @@ recurse() {
|
|||||||
|
|
||||||
elapsed=$(($finish - $start))
|
elapsed=$(($finish - $start))
|
||||||
rel="${rel_current##"${root}/"}"
|
rel="${rel_current##"${root}/"}"
|
||||||
printf "\t${the_test_shell}\t${rel}\t${result}\t${elapsed}\n" \
|
printf "\t${sh}\t${rel}\t${result}\t${elapsed}\n" \
|
||||||
>> "${urchin_tmp}"/log
|
>> "${urchin_tmp}"/log
|
||||||
exit "${exit_code}"
|
exit "${exit_code}"
|
||||||
) &
|
) &
|
||||||
|
Loading…
Reference in New Issue
Block a user