Commit c22826bf authored by Bjorn Munch's avatar Bjorn Munch

Bug #48240 "Test suite timeout" and "Too many tests failed" is masked from status page

Prepend "Completed", "Timeout" or "Too many failed" to summary line
parent 0777ef56
...@@ -222,8 +222,8 @@ sub mtr_report_test ($) { ...@@ -222,8 +222,8 @@ sub mtr_report_test ($) {
} }
sub mtr_report_stats ($;$) { sub mtr_report_stats ($$;$) {
my ($tests, $dont_error)= @_; my ($prefix, $tests, $dont_error)= @_;
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Find out how we where doing # Find out how we where doing
...@@ -328,6 +328,9 @@ sub mtr_report_stats ($;$) { ...@@ -328,6 +328,9 @@ sub mtr_report_stats ($;$) {
} }
} }
# Print summary line prefix
print "$prefix: ";
# Print a list of testcases that failed # Print a list of testcases that failed
if ( $tot_failed != 0 ) if ( $tot_failed != 0 )
{ {
......
...@@ -411,7 +411,7 @@ sub main { ...@@ -411,7 +411,7 @@ sub main {
$opt_gcov_msg, $opt_gcov_err); $opt_gcov_msg, $opt_gcov_err);
} }
mtr_report_stats($completed); mtr_report_stats("Completed", $completed);
exit(0); exit(0);
} }
...@@ -533,7 +533,7 @@ sub run_test_server ($$$) { ...@@ -533,7 +533,7 @@ sub run_test_server ($$$) {
$num_failed_test >= $opt_max_test_fail) { $num_failed_test >= $opt_max_test_fail) {
$suite_timeout_proc->kill(); $suite_timeout_proc->kill();
push(@$completed, $result); push(@$completed, $result);
mtr_report_stats($completed, 1); mtr_report_stats("Too many failed", $completed, 1);
mtr_report("Too many tests($num_failed_test) failed!", mtr_report("Too many tests($num_failed_test) failed!",
"Terminating..."); "Terminating...");
return undef; return undef;
...@@ -665,7 +665,7 @@ sub run_test_server ($$$) { ...@@ -665,7 +665,7 @@ sub run_test_server ($$$) {
# ---------------------------------------------------- # ----------------------------------------------------
if ( ! $suite_timeout_proc->wait_one(0) ) if ( ! $suite_timeout_proc->wait_one(0) )
{ {
mtr_report_stats($completed, 1); mtr_report_stats("Timeout", $completed, 1);
mtr_report("Test suite timeout! Terminating..."); mtr_report("Test suite timeout! Terminating...");
return undef; return undef;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment