Compare commits

...

4 Commits

Author SHA1 Message Date
Thomas Levine
dc0a030f71 change tests that need series flag to be series 2016-02-26 17:28:04 +00:00
Thomas Levine
41a63f003c better waiting 2016-02-26 17:27:14 +00:00
Thomas Levine
aa05b95715 add wait and stuff still works 2016-02-26 17:17:00 +00:00
Thomas Levine
c611667152 add --b, --series parser 2016-02-26 16:54:25 +00:00
3 changed files with 28 additions and 12 deletions

View File

@ -1,5 +1,5 @@
tmp=$(mktemp)
../urchin -e -f ./.die-on-fail > $tmp
../urchin -e -b -f ./.die-on-fail > $tmp
result=$?
grep '1 should run.' $tmp

View File

@ -1,4 +1,4 @@
tmp=$(mktemp)
../../urchin -t .testsuite/ | sed 1d > $tmp
../../urchin -b -t .testsuite/ | sed 1d > $tmp
diff $tmp .expected-output

36
urchin
View File

@ -67,17 +67,23 @@ recurse() {
[ -f setup ] && [ -x setup ] && ./setup >> "$stdout_file"
# $2 instead of $indent_level so it doesn't clash
recurse "${test}" $(( $2 + 1 )) "$shell_for_sh_tests"
exit_code=$?
if $exit_on_fail && test $exit_code -ne 0; then
(
recurse "${test}" $(( $2 + 1 )) "$shell_for_sh_tests"
exit_code=$?
[ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file"
[ -f teardown_dir ] && [ -x teardown_dir ] && ./teardown_dir >> "$stdout_file"
return 1
fi
exit $exit_code
) &
[ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file"
if $single_process; then
wait $!
exit_code=$?
if $exit_on_fail && test $exit_code -ne 0; then
[ -f teardown_dir ] && [ -x teardown_dir ] && ./teardown_dir >> "$stdout_file"
return 1
fi
fi
done
wait
[ -f teardown_dir ] && [ -x teardown_dir ] && ./teardown_dir >> "$stdout_file"
)
if $tap_format; then
@ -98,6 +104,7 @@ recurse() {
else
TEST_SHELL="$TEST_SHELL" ./"$potential_test" > "$stdout_file" 2>&1
fi
exit_code="$?"
[ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file"
@ -182,6 +189,8 @@ $USAGE
-s <shell> Invoke test scripts that either have no shebang line at all or
have shebang line "#!/bin/sh" with the specified shell.
-b, --series Run all tests in series in a single process. The default
is to run tests from the same directory in parallel.
-e Stop running if any single test fails. This is helpful if you want
to use Urchin to run things other than tests, such as a set of
configuration scripts.
@ -267,6 +276,7 @@ urchin_molly_guard() {
exit 1
}
single_process=false
shell_for_sh_tests=
force=false
exit_on_fail=false
@ -274,6 +284,7 @@ tap_format=false
while [ $# -gt 0 ]
do
case "$1" in
-b|--series) single_process=true;;
-e) exit_on_fail=true;;
-f) force=true;;
-s)
@ -282,7 +293,7 @@ do
which "$shell_for_sh_tests" > /dev/null || {
echo "Cannot find specified shell: '$shell_for_sh_tests'" >&2
urchin_help >&2
exit 2
exit 3
} ;;
-t) tap_format=true;;
-h|--help) urchin_help
@ -301,7 +312,12 @@ if [ "$#" != '1' ] || [ ! -d "$1" ]
then
[ -n "$1" ] && [ ! -d "$1" ] && echo "Not a directory: '$1'" >&2
echo "$USAGE" >&2
exit 2
exit 3
fi
if $exit_on_fail && ! $single_process; then
echo 'You must specify -b/--series in order to use -e.' >&2
exit 3
fi
# Constants