implement --timeout
This commit is contained in:
parent
34a065c074
commit
8aab5dad0d
9
urchin
9
urchin
|
@ -155,15 +155,15 @@ recurse() {
|
||||||
{
|
{
|
||||||
if $cycle_shell &&
|
if $cycle_shell &&
|
||||||
has_sh_or_no_shebang_line "$potential_test"; then
|
has_sh_or_no_shebang_line "$potential_test"; then
|
||||||
TEST_SHELL="$the_test_shell" "$the_test_shell" \
|
TEST_SHELL="$the_test_shell" $TIMEOUT \
|
||||||
"$potential_test"
|
"$the_test_shell" "$potential_test"
|
||||||
else
|
else
|
||||||
# Shell cycling is disabled with -n; use the present value of
|
# Shell cycling is disabled with -n; use the present value of
|
||||||
# TEST_SHELL or default to /bin/sh
|
# TEST_SHELL or default to /bin/sh
|
||||||
if [ -n "$TEST_SHELL" ]; then
|
if [ -n "$TEST_SHELL" ]; then
|
||||||
"$potential_test"
|
$TIMEOUT "$potential_test"
|
||||||
else
|
else
|
||||||
TEST_SHELL=/bin/sh "$potential_test"
|
TEST_SHELL=/bin/sh $TIMEOUT "$potential_test"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
} > "$(stdout_file "$potential_test" "$the_test_shell")" 2>&1
|
} > "$(stdout_file "$potential_test" "$the_test_shell")" 2>&1
|
||||||
|
@ -370,7 +370,6 @@ The following flags affect how Urchin processes tests.
|
||||||
configuration files with Urchin.
|
configuration files with Urchin.
|
||||||
-T, --timeout <seconds> Kill a test if it runs for longer than the
|
-T, --timeout <seconds> Kill a test if it runs for longer than the
|
||||||
specified duration. The default is no timeout.
|
specified duration. The default is no timeout.
|
||||||
XXX Not yet implemented
|
|
||||||
-f, --force Force running even if the test directory's name
|
-f, --force Force running even if the test directory's name
|
||||||
does not contain the word "test".
|
does not contain the word "test".
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user