log format
This commit is contained in:
parent
0feeb7233b
commit
deaf05c062
13
urchin
13
urchin
|
@ -315,8 +315,9 @@ recurse() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
if contains "${potential_test}" \
|
# Return if we should not run this file
|
||||||
"^${potential_test}" "^${requested_path}" ; then
|
if contains "${potential_test}" "^${requested_path}" ||
|
||||||
|
contains "${requested_path}" "^${potential_test}" ; then
|
||||||
if test "$(dirname "${potential_test}")" = \
|
if test "$(dirname "${potential_test}")" = \
|
||||||
"$(dirname "${requested_path}")" &&
|
"$(dirname "${requested_path}")" &&
|
||||||
test "${potential_test}" != "${requested_path}"; then
|
test "${potential_test}" != "${requested_path}"; then
|
||||||
|
@ -326,8 +327,8 @@ recurse() {
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if contains "${potential_test}" "${DELIMITERS}"; then
|
if contains "${potential_test}" "${HT}"; then
|
||||||
echo 'Test file names may not contain ASCII delimiters.' >&2
|
echo 'Test file names may not contain tabs (HT).' >&2
|
||||||
urchin_exit 11
|
urchin_exit 11
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -419,7 +420,7 @@ recurse() {
|
||||||
|
|
||||||
elapsed=$(($finish - $start))
|
elapsed=$(($finish - $start))
|
||||||
rel="${potential_test##"${root}/"}"
|
rel="${potential_test##"${root}/"}"
|
||||||
printf "${rel}\t${the_test_shell}\t${result}\t${elapsed}\n" \
|
printf "\t${the_test_shell}\t${rel}\t${result}\t${elapsed}\n" \
|
||||||
>> "${urchin_tmp}"/log
|
>> "${urchin_tmp}"/log
|
||||||
exit "${exit_code}"
|
exit "${exit_code}"
|
||||||
) &
|
) &
|
||||||
|
@ -440,7 +441,7 @@ recurse() {
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# Shell is ''
|
# Shell is ''
|
||||||
printf "${potential_test}\t\tskip\t0\n" >> "${urchin_tmp}"/log
|
printf "\t\t${potential_test}\tskip\t0\n" >> "${urchin_tmp}"/log
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user