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

explosions...

This commit is contained in:
Thomas Levine 2016-04-11 05:44:58 +00:00
parent d92a9bc801
commit bd4d06bef6
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
urchin
View File

@ -277,11 +277,11 @@ is_set() {
# File where a test's stdout and stderr is saved # File where a test's stdout and stderr is saved
stdout_file() { stdout_file() {
tmp_dir="${1}" urchin_tmp="${1}"
the_test="${2}" the_test="${2}"
the_shell="${3}" the_shell="${3}"
x="${tmp_dir}/stdout$(localpath "$the_test")" x="${urchin_tmp}/stdout$(localpath "$the_test")"
mkdir -p "${x}" mkdir -p "${x}"
echo "${x}/$(md5 "${the_shell}")" echo "${x}/$(md5 "${the_shell}")"
} }
@ -340,7 +340,7 @@ meta_verbosity() {
format_tap() { format_tap() {
v="${1}" v="${1}"
tmp_dir="${2}" urchin_tmp="${2}"
elapsed="${3}" elapsed="${3}"
$(meta_verbosity v 2 print_not_ok_stdout) $(meta_verbosity v 2 print_not_ok_stdout)
@ -348,7 +348,7 @@ format_tap() {
print_stdout() { print_stdout() {
echo '# ------------ Begin output ------------' echo '# ------------ Begin output ------------'
sed 's/^/# /' "$(stdout_file "${tmp_dir}" "${path}" "${the_shell}")" sed 's/^/# /' "$(stdout_file "${urchin_tmp}" "${path}" "${the_shell}")"
echo '# ------------ End output ------------' echo '# ------------ End output ------------'
} }
@ -373,7 +373,7 @@ format_tap() {
format_urchin() { format_urchin() {
v="${1}" v="${1}"
tmp_dir="${2}" urchin_tmp="${2}"
verbosity="${3}" verbosity="${3}"
print_in_color="${4}" print_in_color="${4}"
@ -401,11 +401,11 @@ format_urchin() {
} }
print_stdout() { print_stdout() {
sed 's/^/ | /' "$(stdout_file "${tmp_dir}" "${path}" "${the_shell}")" sed 's/^/ | /' "$(stdout_file "${urchin_tmp}" "${path}" "${the_shell}")"
} }
while IFS="${HT}" read -r remote the_shell path result file_elapsed; do while IFS="${HT}" read -r remote the_shell path result file_elapsed; do
abspath=${tmp_dir}/${path} abspath=${urchin_tmp}/${path}
currentdir="$(dirname -- "${path}")" currentdir="$(dirname -- "${path}")"
prevdir="${currentdir}" prevdir="${currentdir}"
@ -511,8 +511,8 @@ recurse() {
break break
fi fi
recurse "${abs_root}" "${abs_requested}" "${abs_current}/${test}" \ # recurse "${abs_root}" "${abs_requested}" "${abs_current}/${test}" \
"${run_in_series_root}" "${exit_on_not_ok}" & # "${run_in_series_root}" "${exit_on_not_ok}" &
eval "${meta_finalize}" eval "${meta_finalize}"
done done
@ -525,7 +525,7 @@ recurse() {
( (
eval "$(dot_if_exists setup)" eval "$(dot_if_exists setup)"
out_file="$(stdout_file "${tmp_dir}" "${rel_current}" "${sh}")" out_file="$(stdout_file "${urchin_tmp}" "${rel_current}" "${sh}")"
# Run with a shell? # Run with a shell?
if has_shebang_line "${abs_current}"; then if has_shebang_line "${abs_current}"; then
@ -552,7 +552,7 @@ recurse() {
log "${remote}" "${rel_curent}" "${result}" "${elapsed}" \ log "${remote}" "${rel_curent}" "${result}" "${elapsed}" \
>> "${urchin_tmp}"/log >> "${urchin_tmp}"/log
exit "${exit_code}" exit "${exit_code}"
) & )#&
eval "${meta_finalize}" eval "${meta_finalize}"
done done
wait wait
@ -702,8 +702,13 @@ want to run urchin on that directory.' >&2
while read -r seed; do while read -r seed; do
root="$(test_suite_root "${seed}")" root="$(test_suite_root "${seed}")"
abs="$(fullpath "${seed}")" abs="$(fullpath "${seed}")"
return_code=$(catch recurse "${root}" "${abs}" "${abs}" \
"${run_in_series}" "${exit_on_not_ok}") set +e
recurse "${root}" "${abs}" "${abs}" \
"${run_in_series}" "${exit_on_not_ok}"
return_code=$?
set -e
echo $return_code
if test "${return_code}" -eq 0; then break; fi if test "${return_code}" -eq 0; then break; fi
done<<EOF done<<EOF
${test_seeds} ${test_seeds}