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

move more reporting

Browse Source
This commit is contained in:
Thomas Levine 2016-02-28 09:17:16 +00:00
parent d2f676e9e9
commit 76db160a1c
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
urchin
View File

@ -75,6 +75,7 @@ recurse() {
) )
else else
stdout_file="$tmp/stdout$(fullpath "$potential_test")" stdout_file="$tmp/stdout$(fullpath "$potential_test")"
mkdir -p "$(dirname "$stdout_file")"
> $stdout_file > $stdout_file
if [ -x "$potential_test" ]; then if [ -x "$potential_test" ]; then
[ -f setup ] && . ./setup > /dev/null [ -f setup ] && . ./setup > /dev/null
@ -101,7 +102,7 @@ recurse() {
result=skip result=skip
fi fi
echo "${potential_test} ${result}" >> "$tmp"/log printf "${potential_test}\t${result}\n" >> "$tmp"/log
if $exit_on_fail && test 0 -ne $exit_code; then if $exit_on_fail && test 0 -ne $exit_code; then
return 1 return 1
fi fi
@ -173,6 +174,33 @@ report_outcome() {
esac esac
fi fi
rm $stdout_file rm $stdout_file
finish=$(date +%s)
elapsed=$(($finish - $start))
set +e
passed=$(grep -c '^success' "$logfile")
failed=$(grep -c '^fail' "$logfile")
skipped=$(grep -c '^skip' "$logfile")
if $tap_format; then
echo "# Took $elapsed $(plural second $elapsed)."
echo 1..$(($passed + $failed + $skipped))
else
echo "Done, took $elapsed $(plural second $elapsed)."
printf '%s\n' "$passed $(plural test "$passed") passed."
printf '%s\n' "$skipped $(plural test "$skipped") skipped."
# If tests failed, print the message in red, otherwise in green.
[ $failed -gt 0 ] && printf '\033[31m' || printf '\033[32m'
printf '%s\n' "$failed $(plural test "$failed") failed."
printf '\033[m'
fi
rm -f "$logfile"
test -z "$failed" || test "$failed" -eq '0'
} }
has_sh_or_no_shebang_line() { has_sh_or_no_shebang_line() {
@ -245,30 +273,6 @@ urchin_go() {
# 2 indentation level # 2 indentation level
# 3 shell to invoke test scripts with # 3 shell to invoke test scripts with
recurse "$1" 0 "$2" || : recurse "$1" 0 "$2" || :
finish=$(date +%s)
elapsed=$(($finish - $start))
set +e
passed=$(grep -c '^success' "$logfile")
failed=$(grep -c '^fail' "$logfile")
skipped=$(grep -c '^skip' "$logfile")
if $tap_format; then
echo "# Took $elapsed $(plural second $elapsed)."
echo 1..$(($passed + $failed + $skipped))
else
echo "Done, took $elapsed $(plural second $elapsed)."
printf '%s\n' "$passed $(plural test "$passed") passed."
printf '%s\n' "$skipped $(plural test "$skipped") skipped."
# If tests failed, print the message in red, otherwise in green.
[ $failed -gt 0 ] && printf '\033[31m' || printf '\033[32m'
printf '%s\n' "$failed $(plural test "$failed") failed."
printf '\033[m'
fi
rm -f "$logfile"
test -z "$failed" || test "$failed" -eq '0'
} }
urchin_molly_guard() { urchin_molly_guard() {