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

add wait and stuff still works

Browse Source
This commit is contained in:
Thomas Levine 2016-02-26 17:17:00 +00:00
parent c611667152
commit aa05b95715
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
urchin
View File

@ -67,7 +67,10 @@ recurse() {
[ -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" &
# if $single_process; then wait; fi
wait $!
exit_code=$? exit_code=$?
if $exit_on_fail && test $exit_code -ne 0; then if $exit_on_fail && test $exit_code -ne 0; then
@ -98,6 +101,7 @@ recurse() {
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="$?"
[ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file" [ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file"
@ -269,7 +273,7 @@ urchin_molly_guard() {
exit 1 exit 1
} }
parallel=true single_process=false
shell_for_sh_tests= shell_for_sh_tests=
force=false force=false
exit_on_fail=false exit_on_fail=false
@ -277,7 +281,7 @@ tap_format=false
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
case "$1" in case "$1" in
-b|--series) parallel=false;; -b|--series) single_process=true;;
-e) exit_on_fail=true;; -e) exit_on_fail=true;;
-f) force=true;; -f) force=true;;
-s) -s)