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

Compare commits

merge into: tlevine:master
Branches Tags
tlevine:master
tlevine:github
tlevine:PeterDaveHello/patch-2
tlevine:remote-testing
tlevine:try-time
tlevine:max-forks
tlevine:urchin-root-2
tlevine:urchin-root
tlevine:single-file
tlevine:parallel
tlevine:source-setup-teardown
tlevine:mksh
tlevine:todo
tlevine:more-shells
tlevine:tlevine-2016-02
tlevine:tap
tlevine:exit-on-fail
tlevine:update-readme
tlevine:remove-urchin-x
tlevine:stop-on-failure
tlevine:urchin-x
tlevine:v0.1.0-rc3
tlevine:v0.1.0-rc2
tlevine:v0.0.6
tlevine:v0.0.5
tlevine:v0.0.2
tlevine:v0.0.1
...
pull from: tlevine:source-setup-teardown
Branches Tags
tlevine:master
tlevine:github
tlevine:PeterDaveHello/patch-2
tlevine:remote-testing
tlevine:try-time
tlevine:max-forks
tlevine:urchin-root-2
tlevine:urchin-root
tlevine:single-file
tlevine:parallel
tlevine:source-setup-teardown
tlevine:mksh
tlevine:todo
tlevine:more-shells
tlevine:tlevine-2016-02
tlevine:tap
tlevine:exit-on-fail
tlevine:update-readme
tlevine:remove-urchin-x
tlevine:stop-on-failure
tlevine:urchin-x
tlevine:v0.1.0-rc3
tlevine:v0.1.0-rc2
tlevine:v0.0.6
tlevine:v0.0.5
tlevine:v0.0.2
tlevine:v0.0.1

1 Commits
master ... source-set

Author SHA1 Message Date
Thomas Levine
1737b4cbbb source setup and teardown 2016-02-26 16:32:52 +00:00
1 changed files with 8 additions and 8 deletions
Show Stats Expand all files Collapse all files

16
urchin
View File

@ -55,7 +55,7 @@ recurse() {
( (
cd -- "$potential_test" cd -- "$potential_test"
[ -f setup_dir ] && [ -x setup_dir ] && ./setup_dir >> "$stdout_file" [ -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
@ -64,21 +64,21 @@ recurse() {
for test in * for test in *
do do
[ -f setup ] && [ -x setup ] && ./setup >> "$stdout_file" [ -f setup ] && [ -x setup ] && . ./setup >> "$stdout_file"
# $2 instead of $indent_level so it doesn't clash # $2 instead of $indent_level so it doesn't clash
recurse "${test}" $(( $2 + 1 )) "$shell_for_sh_tests" recurse "${test}" $(( $2 + 1 )) "$shell_for_sh_tests"
exit_code=$? exit_code=$?
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 ] && [ -x teardown ] && . ./teardown >> "$stdout_file"
[ -f teardown_dir ] && [ -x teardown_dir ] && ./teardown_dir >> "$stdout_file" [ -f teardown_dir ] && [ -x teardown_dir ] && . ./teardown_dir >> "$stdout_file"
return 1 return 1
fi fi
[ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file" [ -f teardown ] && [ -x teardown ] && . ./teardown >> "$stdout_file"
done done
[ -f teardown_dir ] && [ -x teardown_dir ] && ./teardown_dir >> "$stdout_file" [ -f teardown_dir ] && [ -x teardown_dir ] && . ./teardown_dir >> "$stdout_file"
) )
if $tap_format; then if $tap_format; then
indent $indent_level | sed 's/ /#/g' indent $indent_level | sed 's/ /#/g'
@ -89,7 +89,7 @@ recurse() {
else else
if [ -x "$potential_test" ] if [ -x "$potential_test" ]
then then
[ -f setup ] && [ -x setup ] && ./setup >> "$stdout_file" [ -f setup ] && [ -x setup ] && . ./setup >> "$stdout_file"
# Run the test # Run the test
if [ -n "$shell_for_sh_tests" ] && has_sh_or_no_shebang_line ./"$potential_test" if [ -n "$shell_for_sh_tests" ] && has_sh_or_no_shebang_line ./"$potential_test"
@ -100,7 +100,7 @@ recurse() {
fi fi
exit_code="$?" exit_code="$?"
[ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file" [ -f teardown ] && [ -x teardown ] && . ./teardown >> "$stdout_file"
if [ $exit_code -eq 0 ]; then if [ $exit_code -eq 0 ]; then
result=success result=success
else else