Bug #45190 mtr should report some statistics even if aborting after too many tests fail

Added calls to mtr_report_stats() also after timeout or too many failures
This commit is contained in:
Bjorn Munch 2009-06-02 10:00:45 +02:00
parent 709cd00979
commit ad365a5c07
2 changed files with 6 additions and 3 deletions

View file

@ -221,8 +221,8 @@ sub mtr_report_test ($) {
}
sub mtr_report_stats ($) {
my $tests= shift;
sub mtr_report_stats ($;$) {
my ($tests, $dont_error)= @_;
# ----------------------------------------------------------------------
# Find out how we where doing
@ -374,7 +374,7 @@ sub mtr_report_stats ($) {
if ( $tot_failed != 0 || $found_problems)
{
mtr_error("there were failing test cases");
mtr_error("there were failing test cases") unless $dont_error;
}
}

View file

@ -528,6 +528,8 @@ sub run_test_server ($$$) {
elsif ($opt_max_test_fail > 0 and
$num_failed_test >= $opt_max_test_fail) {
$suite_timeout_proc->kill();
push(@$completed, $result);
mtr_report_stats($completed, 1);
mtr_report("Too many tests($num_failed_test) failed!",
"Terminating...");
return undef;
@ -659,6 +661,7 @@ sub run_test_server ($$$) {
# ----------------------------------------------------
if ( ! $suite_timeout_proc->wait_one(0) )
{
mtr_report_stats($completed, 1);
mtr_report("Test suite timeout! Terminating...");
return undef;
}