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

separate stdout files

Browse Source
This commit is contained in:
Thomas Levine 2016-02-28 01:25:36 +00:00
parent 97a1cbffd4
commit 5bd70ab947
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
urchin
View File

@ -44,10 +44,8 @@ recurse() {
fi fi
( (
stdout_file=$(mktemp)
cd -- "$potential_test" cd -- "$potential_test"
[ -f setup_dir ] && . ./setup_dir > /dev/null
[ -f setup_dir ] && [ -x setup_dir ] && ./setup_dir >> "$stdout_file"
if [ -n "$ZSH_VERSION" ]; then if [ -n "$ZSH_VERSION" ]; then
# avoid "no matches found: *" error when directories are empty # avoid "no matches found: *" error when directories are empty
@ -55,7 +53,7 @@ recurse() {
fi fi
for test in *; do for test in *; do
[ -f setup ] && [ -x setup ] && ./setup [ -f setup ] && . ./setup > /dev/null
set +e set +e
# $2 instead of $indent_level so it doesn't clash # $2 instead of $indent_level so it doesn't clash
@ -64,17 +62,14 @@ recurse() {
set -e set -e
if $exit_on_fail && test $exit_code -ne 0; then if $exit_on_fail && test $exit_code -ne 0; then
[ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file" [ -f teardown ] && . ./teardown > /dev/null
[ -f teardown_dir ] && [ -x teardown_dir ] && ./teardown_dir >> "$stdout_file" [ -f teardown_dir ] && . ./teardown_dir > /dev/null
return 1 return 1
fi fi
[ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file" [ -f teardown ] && . ./teardown > /dev/null
done done
[ -f teardown_dir ] && [ -x teardown_dir ] && ./teardown_dir >> "$stdout_file" [ -f teardown_dir ] && . ./teardown_dir > /dev/null
cd ..
rm $stdout_file
) )
if $tap_format; then if $tap_format; then
indent $indent_level | sed 's/ /#/g' indent $indent_level | sed 's/ /#/g'
@ -83,20 +78,22 @@ recurse() {
echo echo
fi fi
else else
if [ -x "$potential_test" ] stdout_file=$(mktemp)
then > $stdout_file
[ -f setup ] && [ -x setup ] && ./setup >> "$stdout_file" if [ -x "$potential_test" ]; then
[ -f setup ] && . ./setup > /dev/null
# Run the test # Run the test
if [ -n "$shell_for_sh_tests" ] && has_sh_or_no_shebang_line ./"$potential_test" set +e
then if [ -n "$shell_for_sh_tests" ] && has_sh_or_no_shebang_line ./"$potential_test"; then
TEST_SHELL="$TEST_SHELL" "$shell_for_sh_tests" ./"$potential_test" > "$stdout_file" 2>&1 TEST_SHELL="$TEST_SHELL" "$shell_for_sh_tests" ./"$potential_test" > "$stdout_file" 2>&1
else else
TEST_SHELL="$TEST_SHELL" ./"$potential_test" > "$stdout_file" 2>&1 TEST_SHELL="$TEST_SHELL" ./"$potential_test" > "$stdout_file" 2>&1
fi fi
exit_code="$?" exit_code="$?"
set -e
[ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file" [ -f teardown ] && . ./teardown > /dev/null
if [ $exit_code -eq 0 ]; then if [ $exit_code -eq 0 ]; then
result=success result=success
elif [ $exit_code -eq 3 ]; then elif [ $exit_code -eq 3 ]; then
@ -152,12 +149,12 @@ recurse() {
;; ;;
esac esac
fi fi
rm $stdout_file
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
fi fi
[ $indent_level -eq 0 ] && rm "$stdout_file"
} }
has_sh_or_no_shebang_line() { has_sh_or_no_shebang_line() {
@ -304,7 +301,6 @@ fi
# Constants # Constants
logfile=$(fullpath "$1")/.urchin.log logfile=$(fullpath "$1")/.urchin.log
stdout_file=$(fullpath "$1")/.urchin_stdout
# Run or present the Molly guard. # Run or present the Molly guard.
if fullpath "$1" | grep -Fi 'test' > /dev/null || $force if fullpath "$1" | grep -Fi 'test' > /dev/null || $force